Selenium: increase default startup timeout to 60 seconds (#4357)

Co-authored-by: Eddú Meléndez Gonzales <eddu.melendez@gmail.com>
testcontainers · Nov 28, 2023 · 77cd560 · 77cd560
1 parent 101b6a7
commit 77cd560
Showing 1 changed file with 15 additions and 22 deletions.
diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
@@ -103,17 +103,7 @@ public class BrowserWebDriverContainer<SELF extends BrowserWebDriverContainer<SE
 
     public BrowserWebDriverContainer() {
         super();
-        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(
-                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
-            )
-            .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
-
-        this.waitStrategy =
-            new WaitAllStrategy()
-                .withStrategy(logWaitStrategy)
-                .withStrategy(new HostPortWaitStrategy())
-                .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
+        this.waitStrategy = getDefaultWaitStrategy();
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
     }
@@ -134,17 +124,7 @@ public BrowserWebDriverContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
         // we assert compatibility with the chrome/firefox/edge image later, after capabilities are processed
 
-        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
-            .withRegEx(
-                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
-            )
-            .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
-
-        this.waitStrategy =
-            new WaitAllStrategy()
-                .withStrategy(logWaitStrategy)
-                .withStrategy(new HostPortWaitStrategy())
-                .withStartupTimeout(Duration.of(15, ChronoUnit.SECONDS));
+        this.waitStrategy = getDefaultWaitStrategy();
 
         this.withRecordingFileFactory(new DefaultRecordingFileFactory());
 
@@ -453,6 +433,19 @@ public SELF withRecordingFileFactory(RecordingFileFactory recordingFileFactory)
         return self();
     }
 
+    private WaitStrategy getDefaultWaitStrategy() {
+        final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
+            .withRegEx(
+                ".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n"
+            )
+            .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
+
+        return new WaitAllStrategy()
+            .withStrategy(logWaitStrategy)
+            .withStrategy(new HostPortWaitStrategy())
+            .withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
+    }
+
     public enum VncRecordingMode {
         SKIP,
         RECORD_ALL,