Skip to content

Reuse BrowserWebDriverContainer's network for VNC recorder #5617

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Reuse BrowserWebDriverContainer's network for VNC recorder #5617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b67a48
Reuse `BrowserWebDriverContainer`'s network for VNC recorder
bsideup Jul 28, 2022
0589c39
fix code style
bsideup Jul 28, 2022
b6bd052
Fix checkstyle
eddumelendez Jul 28, 2022
83b3fd9
Fix japicmp
eddumelendez Jul 28, 2022
5dbfe1c
Merge branch 'main' into reuse_browser_network
eddumelendez Dec 14, 2022
e32c945
Merge branch 'main' into reuse_browser_network
eddumelendez Mar 14, 2023
3019299
Merge remote-tracking branch 'origin/main' into reuse_browser_network
eddumelendez Sep 26, 2023
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
3 changes: 1 addition & 2 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ tasks.japicmp {
methodExcludes = [
"org.testcontainers.containers.Container#getDockerClient()",
"org.testcontainers.containers.ContainerState#getDockerClient()",
"org.testcontainers.containers.ContainerState#execInContainerWithUser(java.lang.String,java.lang.String[])",
"org.testcontainers.containers.ContainerState#execInContainerWithUser(java.nio.charset.Charset,java.lang.String,java.lang.String[])",
"org.testcontainers.containers.Network#ofContainer(java.lang.String)",
]

fieldExcludes = []
Expand Down
16 changes: 16 additions & 0 deletions core/src/main/java/org/testcontainers/containers/Network.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.github.dockerjava.api.command.CreateNetworkCmd;
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import lombok.Singular;
import org.junit.rules.ExternalResource;
import org.junit.rules.TestRule;
Expand Down Expand Up @@ -38,6 +39,21 @@ static NetworkImpl.NetworkImplBuilder builder() {
return NetworkImpl.builder();
}

static Network ofContainer(@NonNull String containerId) {
class ContainerNetwork extends ExternalResource implements Network {

@Override
public String getId() {
return "container:" + containerId;
}

@Override
public void close() {}
}

return new ContainerNetwork();
}

@Builder
@Getter
class NetworkImpl extends ExternalResource implements Network {
Expand Down
18 changes: 7 additions & 11 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 @@ -196,16 +196,6 @@ protected void configure() {
throw new ContainerLaunchException("Exception while trying to create temp directory", e);
}
}

if (getNetwork() == null) {
withNetwork(Network.SHARED);
}

vncRecordingContainer =
new VncRecordingContainer(this)
.withVncPassword(DEFAULT_PASSWORD)
.withVncPort(VNC_PORT)
.withVideoFormat(recordingFormat);
}

if (customImageName != null) {
Expand Down Expand Up @@ -318,8 +308,14 @@ public int getPort() {

@Override
protected void containerIsStarted(InspectContainerResponse containerInfo) {
if (vncRecordingContainer != null) {
if (recordingMode != VncRecordingMode.SKIP) {
LOGGER.debug("Starting VNC recording");
vncRecordingContainer =
new VncRecordingContainer(Network.ofContainer(containerInfo.getId()), "localhost")
.withVncPassword(DEFAULT_PASSWORD)
.withVncPort(VNC_PORT)
.withVideoFormat(recordingFormat);

vncRecordingContainer.start();
}
}
Expand Down