Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added started log message used in Selenium 4.0.0 #4580

Merged
merged 1 commit into from
Oct 22, 2021
Merged

Added started log message used in Selenium 4.0.0 #4580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/selenium/src/main/java/org/testcontainers/containers/BrowserWebDriverContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,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).*\n")
.withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n")
.withStartupTimeout(Duration.of(15, SECONDS));

this.waitStrategy = new WaitAllStrategy()
Expand Down Expand Up @@ -107,7 +107,7 @@ public BrowserWebDriverContainer(DockerImageName dockerImageName) {
// we assert compatibility with the chrome/firefox image later, after capabilities are processed

final WaitStrategy logWaitStrategy = new LogMessageWaitStrategy()
.withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running).*\n")
.withRegEx(".*(RemoteWebDriver instances should connect to|Selenium Server is up and running|Started Selenium Standalone).*\n")
.withStartupTimeout(Duration.of(15, SECONDS));

this.waitStrategy = new WaitAllStrategy()
Expand Down
6 changes: 3 additions & 3 deletions .../testcontainers/junit/Selenium3xTest.java → ...stcontainers/junit/SeleniumStartTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
* Simple test to check that readiness detection works correctly across major versions of the containers.
*/
@RunWith(Parameterized.class)
public class Selenium3xTest {
public class SeleniumStartTest {

@Parameterized.Parameters(name = "tag: {0}")
public static String[] data() {
return new String[]{"3.4.0", "2.53.0", "2.45.0"};
return new String[]{"4.0.0", "3.4.0", "2.53.0", "2.45.0"};
}

@Parameterized.Parameter()
Expand All @@ -24,7 +24,7 @@ public static String[] data() {
@Test
public void testAdditionalStartupString() {
final DockerImageName imageName = DockerImageName
.parse("selenium/standalone-chrome-debug")
.parse("selenium/standalone-chrome")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm surprised by this - do we not need to be using -debug? 😅

Copy link
Contributor Author

@tobiasstadler tobiasstadler Oct 22, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The -debug images are gone with Selenium 4. The vnc server is now integrated in the normal images.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, thanks for the clarification - you saved me some research!

.withTag(tag);
try (BrowserWebDriverContainer<?> chrome = new BrowserWebDriverContainer<>(imageName)
.withCapabilities(new ChromeOptions())) {
Expand Down