From 26e9aea379520dfe818aff7cb8b7ffc3509303b7 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Fri, 30 Jul 2021 11:41:27 +0200 Subject: [PATCH 1/7] Trigger selenium build on CI --- .../org/testcontainers/junit/ChromeWebDriverContainerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java index bea1909a145..20713d850f8 100644 --- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java +++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java @@ -14,7 +14,7 @@ public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest { // junitRule { @Rule public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer<>() - .withCapabilities(new ChromeOptions()) + .withCapabilities(new ChromeOptions().addArguments("")) // } .withNetwork(NETWORK); From 3cf4925dae8158d7cfb7ef56552fbf4828f5065d Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Fri, 30 Jul 2021 11:52:32 +0200 Subject: [PATCH 2/7] Try again to trigger build --- .../org/testcontainers/junit/ChromeWebDriverContainerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java index 20713d850f8..b6b34d24f61 100644 --- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java +++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java @@ -14,7 +14,7 @@ public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest { // junitRule { @Rule public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer<>() - .withCapabilities(new ChromeOptions().addArguments("")) + .withCapabilities(new ChromeOptions()) // } .withNetwork(NETWORK); @@ -25,6 +25,7 @@ public void checkBrowserIsIndeedChrome() { @Test public void simpleExploreTest() { + System.out.println("force ci"); doSimpleExplore(chrome); } } From da22f26b447cd188a3a1b88c09e80608cb9d2c65 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Fri, 30 Jul 2021 12:19:18 +0200 Subject: [PATCH 3/7] Apply potential fix by disabling GPU --- .../org/testcontainers/junit/ChromeWebDriverContainerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java index b6b34d24f61..91637d834e3 100644 --- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java +++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java @@ -14,7 +14,7 @@ public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest { // junitRule { @Rule public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer<>() - .withCapabilities(new ChromeOptions()) + .withCapabilities(new ChromeOptions().addArguments("--disable-gpu")) // } .withNetwork(NETWORK); From 586f658b85e422d3a92de17e71c18d2a3c497a82 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Fri, 30 Jul 2021 12:47:17 +0200 Subject: [PATCH 4/7] Also --disable-dev-shm-usage --- .../org/testcontainers/junit/ChromeWebDriverContainerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java index 91637d834e3..47b42567f61 100644 --- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java +++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java @@ -14,7 +14,7 @@ public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest { // junitRule { @Rule public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer<>() - .withCapabilities(new ChromeOptions().addArguments("--disable-gpu")) + .withCapabilities(new ChromeOptions().addArguments("--disable-gpu", "--disable-dev-shm-usage")) // } .withNetwork(NETWORK); From dd8a2ee81acda309004e7fe786d7f73acc239e0f Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Fri, 30 Jul 2021 16:18:26 +0200 Subject: [PATCH 5/7] Alwas add disable-gpu flag --- .../containers/BrowserWebDriverContainer.java | 6 ++++++ .../testcontainers/junit/ChromeWebDriverContainerTest.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java index 4a25ae486cd..4c3fb938188 100644 --- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java +++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java @@ -166,6 +166,12 @@ protected void configure() { } } + // hack for new Chrome image + if (capabilities instanceof ChromeOptions) { + ChromeOptions options = (ChromeOptions) this.capabilities; + options.addArguments("--disable-gpu"); + } + if (recordingMode != VncRecordingMode.SKIP) { if (vncRecordingDirectory == null) { diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java index 47b42567f61..b6b34d24f61 100644 --- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java +++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java @@ -14,7 +14,7 @@ public class ChromeWebDriverContainerTest extends BaseWebDriverContainerTest { // junitRule { @Rule public BrowserWebDriverContainer chrome = new BrowserWebDriverContainer<>() - .withCapabilities(new ChromeOptions().addArguments("--disable-gpu", "--disable-dev-shm-usage")) + .withCapabilities(new ChromeOptions()) // } .withNetwork(NETWORK); From 182ec2f135eb02802ad8a5a7e4b95dd5afb92346 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Fri, 30 Jul 2021 16:48:52 +0200 Subject: [PATCH 6/7] Smaller check for hack --- .../testcontainers/containers/BrowserWebDriverContainer.java | 5 +++-- .../testcontainers/junit/ChromeWebDriverContainerTest.java | 1 - 2 files changed, 3 insertions(+), 3 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 index 4c3fb938188..a27e731bdac 100644 --- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java +++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java @@ -166,8 +166,9 @@ protected void configure() { } } - // hack for new Chrome image - if (capabilities instanceof ChromeOptions) { + // hack for new selenium-chrome image that contains Chrome 92 + // If not disabled, container startup will fail in most cases and consume excessive amounts of CPU + if (seleniumVersion.equals("3.141.59") && capabilities instanceof ChromeOptions) { ChromeOptions options = (ChromeOptions) this.capabilities; options.addArguments("--disable-gpu"); } diff --git a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java index b6b34d24f61..bea1909a145 100644 --- a/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java +++ b/modules/selenium/src/test/java/org/testcontainers/junit/ChromeWebDriverContainerTest.java @@ -25,7 +25,6 @@ public void checkBrowserIsIndeedChrome() { @Test public void simpleExploreTest() { - System.out.println("force ci"); doSimpleExplore(chrome); } } From 84e84d59e0967221451ac0ca510ad5da7005e728 Mon Sep 17 00:00:00 2001 From: Kevin Wittek Date: Fri, 30 Jul 2021 17:53:52 +0200 Subject: [PATCH 7/7] Smaller check for hack --- .../containers/BrowserWebDriverContainer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index a27e731bdac..1209b7af019 100644 --- a/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java +++ b/modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java @@ -166,9 +166,9 @@ protected void configure() { } } - // hack for new selenium-chrome image that contains Chrome 92 - // If not disabled, container startup will fail in most cases and consume excessive amounts of CPU - if (seleniumVersion.equals("3.141.59") && capabilities instanceof ChromeOptions) { + // Hack for new selenium-chrome image that contains Chrome 92. + // If not disabled, container startup will fail in most cases and consume excessive amounts of CPU. + if (capabilities instanceof ChromeOptions) { ChromeOptions options = (ChromeOptions) this.capabilities; options.addArguments("--disable-gpu"); }