Skip to content

Commit 9f325c2

Browse files
shs96cshs96c
committed
[bazel] Get the java medium tests passing on the EngFlow grid
1 parent b4c7671 commit 9f325c2

12 files changed

Lines changed: 1307 additions & 1083 deletions

‎common/browsers.bzl‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,61 @@ COMMON_TAGS = [
44
"requires-network",
55
]
66

7-
chrome_data = select({
7+
chromedriver_data = select({
88
"@selenium//common:use_pinned_linux_chrome": [
99
"@linux_chromedriver//:chromedriver",
10+
],
11+
"@selenium//common:use_pinned_macos_chrome": [
12+
"@mac_chromedriver//:chromedriver",
13+
],
14+
"@selenium//common:use_local_chromedriver": ["@selenium//common:chromedriver"],
15+
"//conditions:default": [],
16+
})
17+
18+
chrome_data = select({
19+
"@selenium//common:use_pinned_linux_chrome": [
1020
"@linux_chrome//:files",
1121
"@linux_chrome//:chrome-linux/chrome",
1222
],
1323
"@selenium//common:use_pinned_macos_chrome": [
14-
"@mac_chromedriver//:chromedriver",
1524
"@mac_chrome//:Chromium.app",
1625
],
17-
"@selenium//common:use_local_chromedriver": ["@selenium//common:chromedriver"],
26+
"//conditions:default": [],
27+
}) + chromedriver_data
28+
29+
edgedriver_data = select({
30+
"@selenium//common:use_pinned_macos_edge": [
31+
"@mac_edgedriver//:msedgedriver",
32+
],
33+
"@selenium//common:use_local_msedgedriver": ["@selenium//common:msedgedriver"],
1834
"//conditions:default": [],
1935
})
2036

2137
edge_data = select({
2238
"@selenium//common:use_pinned_macos_edge": [
23-
"@mac_edgedriver//:msedgedriver",
2439
"@mac_edge//:Edge.app",
2540
],
26-
"@selenium//common:use_local_msedgedriver": ["@selenium//common:msedgedriver"],
41+
"//conditions:default": [],
42+
}) + edgedriver_data
43+
44+
geckodriver_data = select({
45+
"@selenium//common:use_pinned_linux_firefox": [
46+
"@linux_geckodriver//:geckodriver",
47+
],
48+
"@selenium//common:use_pinned_macos_firefox": [
49+
"@mac_geckodriver//:geckodriver",
50+
],
51+
"@selenium//common:use_local_geckodriver": ["@selenium//common:geckodriver"],
2752
"//conditions:default": [],
2853
})
2954

3055
firefox_data = select({
3156
"@selenium//common:use_pinned_linux_firefox": [
32-
"@linux_geckodriver//:geckodriver",
3357
"@linux_firefox//:files",
3458
"@linux_firefox//:firefox/firefox",
3559
],
3660
"@selenium//common:use_pinned_macos_firefox": [
37-
"@mac_geckodriver//:geckodriver",
3861
"@mac_firefox//:Firefox.app",
3962
],
40-
"@selenium//common:use_local_geckodriver": ["@selenium//common:geckodriver"],
4163
"//conditions:default": [],
42-
})
64+
}) + geckodriver_data

‎java/browsers.bzl‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
1-
chrome_jvm_flags = select({
1+
chromedriver_jvm_flags = select({
22
"@selenium//common:use_pinned_linux_chrome": [
33
"-Dwebdriver.chrome.driver=$(location @linux_chromedriver//:chromedriver)",
4-
"-Dwebdriver.chrome.binary=$(location @linux_chrome//:chrome-linux/chrome)",
54
],
65
"@selenium//common:use_pinned_macos_chrome": [
76
"-Dwebdriver.chrome.driver=$(location @mac_chromedriver//:chromedriver)",
7+
],
8+
"//conditions:default": [],
9+
})
10+
11+
chrome_jvm_flags = select({
12+
"@selenium//common:use_pinned_linux_chrome": [
13+
"-Dwebdriver.chrome.binary=$(location @linux_chrome//:chrome-linux/chrome)",
14+
],
15+
"@selenium//common:use_pinned_macos_chrome": [
816
"-Dwebdriver.chrome.binary=$(location @mac_chrome//:Chromium.app)/Contents/MacOS/Chromium",
917
],
1018
"@selenium//common:use_local_chromedriver": [],
@@ -16,11 +24,17 @@ chrome_jvm_flags = select({
1624
"-Dwebdriver.headless=true",
1725
],
1826
"//conditions:default": [],
27+
}) + chromedriver_jvm_flags
28+
29+
edgedriver_jvm_flags = select({
30+
"@selenium//common:use_pinned_macos_edge": [
31+
"-Dwebdriver.edge.driver=$(location @mac_edgedriver//:msedgedriver)",
32+
],
33+
"//conditions:default": [],
1934
})
2035

2136
edge_jvm_flags = select({
2237
"@selenium//common:use_pinned_macos_edge": [
23-
"-Dwebdriver.edge.driver=$(location @mac_edgedriver//:msedgedriver)",
2438
"-Dwebdriver.edge.binary=\"$(location @mac_edge//:Edge.app)/Contents/MacOS/Microsoft Edge\"",
2539
],
2640
"@selenium//common:use_local_msedgedriver": [],
@@ -32,15 +46,23 @@ edge_jvm_flags = select({
3246
"-Dwebdriver.headless=true",
3347
],
3448
"//conditions:default": [],
49+
}) + edgedriver_jvm_flags
50+
51+
geckodriver_jvm_flags = select({
52+
"@selenium//common:use_pinned_linux_firefox": [
53+
"-Dwebdriver.gecko.driver=$(location @linux_geckodriver//:geckodriver)",
54+
],
55+
"@selenium//common:use_pinned_macos_firefox": [
56+
"-Dwebdriver.gecko.driver=$(location @mac_geckodriver//:geckodriver)",
57+
],
58+
"//conditions:default": [],
3559
})
3660

3761
firefox_jvm_flags = select({
3862
"@selenium//common:use_pinned_linux_firefox": [
39-
"-Dwebdriver.gecko.driver=$(location @linux_geckodriver//:geckodriver)",
4063
"-Dwebdriver.firefox.bin=$(location @linux_firefox//:firefox/firefox)",
4164
],
4265
"@selenium//common:use_pinned_macos_firefox": [
43-
"-Dwebdriver.gecko.driver=$(location @mac_geckodriver//:geckodriver)",
4466
"-Dwebdriver.firefox.bin=$(location @mac_firefox//:Firefox.app)/Contents/MacOS/firefox",
4567
],
4668
"@selenium//common:use_local_geckodriver": [],
@@ -52,4 +74,4 @@ firefox_jvm_flags = select({
5274
"-Dwebdriver.headless=true",
5375
],
5476
"//conditions:default": [],
55-
})
77+
}) + geckodriver_jvm_flags

‎java/test/org/openqa/selenium/grid/distributor/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ load("//java:defs.bzl", "JUNIT5_DEPS", "java_test_suite")
44
java_test_suite(
55
name = "medium-tests",
66
size = "medium",
7-
srcs = glob(["*Test.java"]),
7+
srcs = glob(["*.java"]),
88
javacopts = [
99
"--release",
1010
"11",

0 commit comments

Comments
 (0)