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

Jump to bottom

Use LogMessageWaitStrategy in VncRecordingContainer #2547

Merged
merged 5 commits into from Apr 12, 2020
Merged

Use LogMessageWaitStrategy in VncRecordingContainer #2547

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2fd3809
Using LogMessageWaitStrategy for VncRecordingContainer (#2063)
Apr 9, 2020
1484753
Merge branch 'master' into vncRecorderTimeoutFix
rnorth Apr 12, 2020
e6d2e9b
Merge branch 'master' into vncRecorderTimeoutFix
rnorth Apr 12, 2020
243c11a
Merge branch 'master' into vncRecorderTimeoutFix
bsideup Apr 12, 2020
b40c632
Merge branch 'master' into vncRecorderTimeoutFix
bsideup Apr 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 7 additions & 40 deletions core/src/main/java/org/testcontainers/containers/VncRecordingContainer.java
View file
Open in desktop
@@ -1,24 +1,21 @@
package org.testcontainers.containers;

import com.github.dockerjava.api.model.Frame;
import lombok.Getter;
import lombok.NonNull;
import lombok.SneakyThrows;
import lombok.ToString;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.rnorth.ducttape.TimeoutException;
import org.rnorth.ducttape.unreliables.Unreliables;
import org.testcontainers.containers.output.FrameConsumerResultCallback;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.utility.TestcontainersConfiguration;

import java.io.Closeable;
import java.io.File;
import java.io.InputStream;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.time.Duration;
import java.util.Base64;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;

import static java.time.temporal.ChronoUnit.SECONDS;

/**
* 'Sidekick container' with the sole purpose of recording the VNC screen output from another container.
Expand Down Expand Up @@ -59,39 +56,9 @@ public VncRecordingContainer(@NonNull Network network, @NonNull String targetNet

this.targetNetworkAlias = targetNetworkAlias;
withNetwork(network);

waitingFor(new AbstractWaitStrategy() {

@Override
protected void waitUntilReady() {
try {
Unreliables.retryUntilTrue((int) startupTimeout.toMillis(), TimeUnit.MILLISECONDS, () -> {
CountDownLatch latch = new CountDownLatch(1);

FrameConsumerResultCallback callback = new FrameConsumerResultCallback() {
@Override
public void onNext(Frame frame) {
if (frame != null && new String(frame.getPayload()).contains("Connected")) {
latch.countDown();
}
}
};

try (
Closeable __ = dockerClient.logContainerCmd(getContainerId())
.withFollowStream(true)
.withSince(0)
.withStdErr(true)
.exec(callback)
) {
return latch.await(1, TimeUnit.SECONDS);
}
});
} catch (TimeoutException e) {
throw new ContainerLaunchException("Timed out waiting for log output", e);
}
}
});
waitingFor(new LogMessageWaitStrategy()
.withRegEx(".*Connected.*")
.withStartupTimeout(Duration.of(15, SECONDS)));
}

public VncRecordingContainer withVncPassword(@NonNull String vncPassword) {
Expand Down