[bazel] Get large grid tests passing in bazel

shs96c · shs96c · commit 8e2b3e1aaa29 · 2023-05-23T16:49:38.000+01:00
diff --git a/java/test/org/openqa/selenium/grid/router/BUILD.bazel b/java/test/org/openqa/selenium/grid/router/BUILD.bazel
@@ -5,11 +5,14 @@ load("//java/src/org/openqa/selenium/devtools:versions.bzl", "CDP_DEPS")
 LARGE_TESTS = [
     "DistributedCdpTest.java",
     "NewSessionCreationTest.java",
-    "RemoteWebDriverBiDiTest.java",
     "RemoteWebDriverDownloadTest.java",
     "StressTest.java",
 ]
 
+FIREFOX_ONLY_LARGE_TESTS = [
+    "RemoteWebDriverBiDiTest.java",
+]
+
 java_library(
     name = "support",
     testonly = True,
@@ -57,27 +60,45 @@ java_selenium_test_suite(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
         "//java/src/org/openqa/selenium/support",
-        "//java/test/org/openqa/selenium/environment",
-        "//java/test/org/openqa/selenium/remote/tracing:tracing-support",
-        "//java/test/org/openqa/selenium/testing:annotations",
-        "//java/test/org/openqa/selenium/testing:test-base",
         "//java/src/org/openqa/selenium/grid",
         "//java/src/org/openqa/selenium/grid/config",
         "//java/src/org/openqa/selenium/grid/distributor",
+        "//java/test/org/openqa/selenium/environment",
         "//java/test/org/openqa/selenium/grid/testing",
+        "//java/test/org/openqa/selenium/remote/tracing:tracing-support",
+        "//java/test/org/openqa/selenium/testing:annotations",
+        "//java/test/org/openqa/selenium/testing:test-base",
         artifact("com.google.guava:guava"),
         artifact("org.junit.jupiter:junit-jupiter-api"),
         artifact("org.junit.jupiter:junit-jupiter-params"),
         artifact("org.assertj:assertj-core"),
     ] + CDP_DEPS + JUNIT5_DEPS,
 )
 
+java_selenium_test_suite(
+    name = "firefox-only-large-tests",
+    size = "large",
+    srcs = FIREFOX_ONLY_LARGE_TESTS,
+    browsers = ["firefox"],
+    deps = [
+        ":support",
+        "//java/src/org/openqa/selenium/firefox",
+        "//java/src/org/openqa/selenium/grid/config",
+        "//java/src/org/openqa/selenium/remote",
+        "//java/test/org/openqa/selenium/environment",
+        "//java/test/org/openqa/selenium/testing:annotations",
+        "//java/test/org/openqa/selenium/testing:test-base",
+        artifact("org.junit.jupiter:junit-jupiter-api"),
+        artifact("org.assertj:assertj-core"),
+    ] + CDP_DEPS + JUNIT5_DEPS,
+)
+
 java_test_suite(
     name = "medium-tests",
     size = "medium",
     srcs = glob(
         ["*Test.java"],
-        exclude = LARGE_TESTS,
+        exclude = LARGE_TESTS + FIREFOX_ONLY_LARGE_TESTS,
     ),
     tags = [
         "requires-network",
diff --git a/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java b/java/test/org/openqa/selenium/grid/router/RemoteWebDriverBiDiTest.java
@@ -63,9 +63,10 @@ void ensureBiDiSessionCreation() {
                         + "driver-implementation = "
                         + browser.displayName())));
 
-    FirefoxOptions options = new FirefoxOptions();
+    FirefoxOptions options = createFirefoxOptions();
     // Enable BiDi
     options.setCapability("webSocketUrl", true);
+    options.merge(Browser.FIREFOX.getCapabilities());
 
     WebDriver driver = new RemoteWebDriver(deployment.getServer().getUrl(), options);
     driver = new Augmenter().augment(driver);
@@ -93,7 +94,7 @@ void canListenToLogs() throws ExecutionException, InterruptedException, TimeoutE
                         + "driver-implementation = "
                         + browser.displayName())));
 
-    FirefoxOptions options = new FirefoxOptions();
+    FirefoxOptions options = createFirefoxOptions();
     // Enable BiDi
     options.setCapability("webSocketUrl", true);
 
@@ -124,7 +125,7 @@ void canListenToLogs() throws ExecutionException, InterruptedException, TimeoutE
   }
 
   @Test
-  void canNavigateToUrl() throws ExecutionException, InterruptedException, TimeoutException {
+  void canNavigateToUrl() {
     Browser browser = Browser.FIREFOX;
 
     Deployment deployment =
@@ -137,7 +138,7 @@ void canNavigateToUrl() throws ExecutionException, InterruptedException, Timeout
                         + "driver-implementation = "
                         + browser.displayName())));
 
-    FirefoxOptions options = new FirefoxOptions();
+    FirefoxOptions options = createFirefoxOptions();
     // Enable BiDi
     options.setCapability("webSocketUrl", true);
 
@@ -156,4 +157,8 @@ void canNavigateToUrl() throws ExecutionException, InterruptedException, Timeout
     assertThat(info.getNavigationId()).isNull();
     assertThat(info.getUrl()).contains("/bidi/logEntryAdded.html");
   }
+
+  private FirefoxOptions createFirefoxOptions() {
+    return (FirefoxOptions) Browser.FIREFOX.getCapabilities();
+  }
 }
