Skip to content

Commit 0107b0e

Browse files
committed
Revert initial work to expose drivers via bazel
Never work on a tree that's not entirely clean.
1 parent 6236860 commit 0107b0e

File tree

6 files changed

+8
-144
lines changed

6 files changed

+8
-144
lines changed

WORKSPACE

-4
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,3 @@ k8s_defaults(
239239
kind = "deployment",
240240
namespace = "selenium",
241241
)
242-
243-
load("//common:repositories.bzl", "pin_browsers")
244-
245-
pin_browsers()

common/BUILD.bazel

+3-38
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,23 @@
1-
package(default_visibility = ["//visibility:public"])
2-
31
config_setting(
42
name = "linux",
53
constraint_values = ["@platforms//os:linux"],
4+
visibility = ["//visibility:public"],
65
)
76

87
config_setting(
98
name = "macos",
109
constraint_values = ["@platforms//os:macos"],
10+
visibility = ["//visibility:public"],
1111
)
1212

1313
config_setting(
1414
name = "windows",
1515
constraint_values = ["@platforms//os:windows"],
16+
visibility = ["//visibility:public"],
1617
)
1718

1819
# Are we creating a stamped build?
1920
config_setting(
2021
name = "stamp",
2122
values = {"stamp": "true"},
2223
)
23-
24-
alias(
25-
name = "chromedriver",
26-
actual = "@local_drivers//:chromedriver",
27-
)
28-
29-
config_setting(
30-
name = "use_chromedriver",
31-
flag_values = {
32-
"@local_drivers//:use_chromedriver": "true",
33-
},
34-
)
35-
36-
alias(
37-
name = "geckodriver",
38-
actual = "@local_drivers//:geckodriver",
39-
)
40-
41-
config_setting(
42-
name = "use_geckodriver",
43-
flag_values = {
44-
"@local_drivers//:use_geckodriver": "true",
45-
},
46-
)
47-
48-
alias(
49-
name = "msedgedriver",
50-
actual = "@local_drivers//:msedgedriver",
51-
)
52-
53-
config_setting(
54-
name = "use_msedgedriver",
55-
flag_values = {
56-
"@local_drivers//:use_msedgedriver": "true",
57-
},
58-
)

common/private/drivers.bzl

-34
This file was deleted.

common/private/selenium_test.bzl

+5-20
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
load(
2-
"//java:browsers.bzl",
3-
"chrome_data",
4-
"chrome_jvm_flags",
5-
"edge_data",
6-
"edge_jvm_flags",
7-
"firefox_data",
8-
"firefox_jvm_flags")
9-
101
DEFAULT_BROWSER = "firefox"
112

123
_COMMON_TAGS = [
@@ -18,14 +9,12 @@ _COMMON_TAGS = [
189
BROWSERS = {
1910
"chrome": {
2011
"deps": ["//java/client/src/org/openqa/selenium/chrome"],
21-
"jvm_flags": ["-Dselenium.browser=chrome"] + chrome_jvm_flags,
22-
"data": chrome_data,
12+
"jvm_flags": ["-Dselenium.browser=chrome"],
2313
"tags": _COMMON_TAGS + ["chrome"],
2414
},
2515
"edge": {
2616
"deps": ["//java/client/src/org/openqa/selenium/edge"],
27-
"jvm_flags": ["-Dselenium.browser=edge"] + edge_jvm_flags,
28-
"data": edge_data,
17+
"jvm_flags": ["-Dselenium.browser=edge"],
2918
"tags": _COMMON_TAGS + ["edge"],
3019
},
3120
"edgehtml": {
@@ -35,13 +24,11 @@ BROWSERS = {
3524
"//common:windows": ["-Dselenium.skiptest=false"],
3625
"//conditions:default": ["-Dselenium.skiptest=true"],
3726
}),
38-
"data": [],
3927
"tags": _COMMON_TAGS + ["exclusive", "edgehtml"],
4028
},
4129
"firefox": {
4230
"deps": ["//java/client/src/org/openqa/selenium/firefox"],
43-
"jvm_flags": ["-Dselenium.browser=ff"] + firefox_jvm_flags,
44-
"data": firefox_data,
31+
"jvm_flags": ["-Dselenium.browser=ff"],
4532
"tags": _COMMON_TAGS + ["firefox"],
4633
},
4734
"ie": {
@@ -51,7 +38,6 @@ BROWSERS = {
5138
"//common:windows": ["-Dselenium.skiptest=false"],
5239
"//conditions:default": ["-Dselenium.skiptest=true"],
5340
}),
54-
"data": [],
5541
"tags": _COMMON_TAGS + ["exclusive", "ie"],
5642
},
5743
"safari": {
@@ -61,7 +47,6 @@ BROWSERS = {
6147
"//common:macos": ["-Dselenium.skiptest=false"],
6248
"//conditions:default": ["-Dselenium.skiptest=true"],
6349
}),
64-
"data": [],
6550
"tags": _COMMON_TAGS + ["exclusive", "safari"],
6651
},
6752
}
@@ -98,7 +83,7 @@ def selenium_test(name, test_class, size = "medium", browsers = None, **kwargs):
9883
size = size,
9984
jvm_flags = BROWSERS[browser]["jvm_flags"] + jvm_flags,
10085
tags = BROWSERS[browser]["tags"] + tags,
101-
data = BROWSERS[browser]["data"] + data,
86+
data = data,
10287
**stripped_args
10388
)
10489

@@ -112,7 +97,7 @@ def selenium_test(name, test_class, size = "medium", browsers = None, **kwargs):
11297
"-Dselenium.browser.remote.path=$(location //java/server/src/org/openqa/selenium/grid:selenium_server_deploy.jar)",
11398
],
11499
tags = BROWSERS[browser]["tags"] + tags + ["remote"],
115-
data = BROWSERS[browser]["data"] + data + [
100+
data = data + [
116101
"//java/server/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
117102
],
118103
**stripped_args

common/repositories.bzl

-6
This file was deleted.

java/browsers.bzl

-42
This file was deleted.

0 commit comments

Comments
 (0)