[bazel] Get the java medium tests passing on the EngFlow grid

Author: shs96c

common/browsers.bzl

@@ -4,39 +4,61 @@ COMMON_TAGS = [
     "requires-network",
 ]
 
-chrome_data = select({
+chromedriver_data = select({
     "@selenium//common:use_pinned_linux_chrome": [
         "@linux_chromedriver//:chromedriver",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "@mac_chromedriver//:chromedriver",
+    ],
+    "@selenium//common:use_local_chromedriver": ["@selenium//common:chromedriver"],
+    "//conditions:default": [],
+})
+
+chrome_data = select({
+    "@selenium//common:use_pinned_linux_chrome": [
         "@linux_chrome//:files",
         "@linux_chrome//:chrome-linux/chrome",
     ],
     "@selenium//common:use_pinned_macos_chrome": [
-        "@mac_chromedriver//:chromedriver",
         "@mac_chrome//:Chromium.app",
     ],
-    "@selenium//common:use_local_chromedriver": ["@selenium//common:chromedriver"],
+    "//conditions:default": [],
+}) + chromedriver_data
+
+edgedriver_data = select({
+    "@selenium//common:use_pinned_macos_edge": [
+        "@mac_edgedriver//:msedgedriver",
+    ],
+    "@selenium//common:use_local_msedgedriver": ["@selenium//common:msedgedriver"],
     "//conditions:default": [],
 })
 
 edge_data = select({
     "@selenium//common:use_pinned_macos_edge": [
-        "@mac_edgedriver//:msedgedriver",
         "@mac_edge//:Edge.app",
     ],
-    "@selenium//common:use_local_msedgedriver": ["@selenium//common:msedgedriver"],
+    "//conditions:default": [],
+}) + edgedriver_data
+
+geckodriver_data = select({
+    "@selenium//common:use_pinned_linux_firefox": [
+        "@linux_geckodriver//:geckodriver",
+    ],
+    "@selenium//common:use_pinned_macos_firefox": [
+        "@mac_geckodriver//:geckodriver",
+    ],
+    "@selenium//common:use_local_geckodriver": ["@selenium//common:geckodriver"],
     "//conditions:default": [],
 })
 
 firefox_data = select({
     "@selenium//common:use_pinned_linux_firefox": [
-        "@linux_geckodriver//:geckodriver",
         "@linux_firefox//:files",
         "@linux_firefox//:firefox/firefox",
     ],
     "@selenium//common:use_pinned_macos_firefox": [
-        "@mac_geckodriver//:geckodriver",
         "@mac_firefox//:Firefox.app",
     ],
-    "@selenium//common:use_local_geckodriver": ["@selenium//common:geckodriver"],
     "//conditions:default": [],
-})
+}) + geckodriver_data

java/browsers.bzl

@@ -1,10 +1,18 @@
-chrome_jvm_flags = select({
+chromedriver_jvm_flags = select({
     "@selenium//common:use_pinned_linux_chrome": [
         "-Dwebdriver.chrome.driver=$(location @linux_chromedriver//:chromedriver)",
-        "-Dwebdriver.chrome.binary=$(location @linux_chrome//:chrome-linux/chrome)",
     ],
     "@selenium//common:use_pinned_macos_chrome": [
         "-Dwebdriver.chrome.driver=$(location @mac_chromedriver//:chromedriver)",
+    ],
+    "//conditions:default": [],
+})
+
+chrome_jvm_flags = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "-Dwebdriver.chrome.binary=$(location @linux_chrome//:chrome-linux/chrome)",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
         "-Dwebdriver.chrome.binary=$(location @mac_chrome//:Chromium.app)/Contents/MacOS/Chromium",
     ],
     "@selenium//common:use_local_chromedriver": [],
@@ -16,11 +24,17 @@ chrome_jvm_flags = select({
         "-Dwebdriver.headless=true",
     ],
     "//conditions:default": [],
+}) + chromedriver_jvm_flags
+
+edgedriver_jvm_flags = select({
+    "@selenium//common:use_pinned_macos_edge": [
+        "-Dwebdriver.edge.driver=$(location @mac_edgedriver//:msedgedriver)",
+    ],
+    "//conditions:default": [],
 })
 
 edge_jvm_flags = select({
     "@selenium//common:use_pinned_macos_edge": [
-        "-Dwebdriver.edge.driver=$(location @mac_edgedriver//:msedgedriver)",
         "-Dwebdriver.edge.binary=\"$(location @mac_edge//:Edge.app)/Contents/MacOS/Microsoft Edge\"",
     ],
     "@selenium//common:use_local_msedgedriver": [],
@@ -32,15 +46,23 @@ edge_jvm_flags = select({
         "-Dwebdriver.headless=true",
     ],
     "//conditions:default": [],
+}) + edgedriver_jvm_flags
+
+geckodriver_jvm_flags = select({
+    "@selenium//common:use_pinned_linux_firefox": [
+        "-Dwebdriver.gecko.driver=$(location @linux_geckodriver//:geckodriver)",
+    ],
+    "@selenium//common:use_pinned_macos_firefox": [
+        "-Dwebdriver.gecko.driver=$(location @mac_geckodriver//:geckodriver)",
+    ],
+    "//conditions:default": [],
 })
 
 firefox_jvm_flags = select({
     "@selenium//common:use_pinned_linux_firefox": [
-        "-Dwebdriver.gecko.driver=$(location @linux_geckodriver//:geckodriver)",
         "-Dwebdriver.firefox.bin=$(location @linux_firefox//:firefox/firefox)",
     ],
     "@selenium//common:use_pinned_macos_firefox": [
-        "-Dwebdriver.gecko.driver=$(location @mac_geckodriver//:geckodriver)",
         "-Dwebdriver.firefox.bin=$(location @mac_firefox//:Firefox.app)/Contents/MacOS/firefox",
     ],
     "@selenium//common:use_local_geckodriver": [],
@@ -52,4 +74,4 @@ firefox_jvm_flags = select({
         "-Dwebdriver.headless=true",
     ],
     "//conditions:default": [],
-})
+}) + geckodriver_jvm_flags

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

@@ -4,7 +4,7 @@ load("//java:defs.bzl", "JUNIT5_DEPS", "java_test_suite")
 java_test_suite(
     name = "medium-tests",
     size = "medium",
-    srcs = glob(["*Test.java"]),
+    srcs = glob(["*.java"]),
     javacopts = [
         "--release",
         "11",