Skip to content

Fix sporadic failures of AttachContainerCmdIT tests #1483

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

Merged
bsideup merged 6 commits into from
Nov 6, 2020
Merged

Fix sporadic failures of AttachContainerCmdIT tests #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d74da7b
Remove unnecessary semicolons
tejksat Oct 26, 2020
881ccf7
Make log field of AttachContainerTestCallback final
tejksat Oct 26, 2020
c89af75
Reformat AttachContainerCmdIT.java
tejksat Oct 26, 2020
33d4259
Fix sporadic failures of AttachContainerCmdIT tests
tejksat Oct 26, 2020
b1acebc
Remove no longer required "sleep 1" before reading line and echoing i…
tejksat Nov 3, 2020
4e81f6e
Remove no longer required cyclic output to stdout and stderr in "atta…
tejksat Nov 3, 2020
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
155 changes: 84 additions & 71 deletions docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.async.ResultCallback;
import com.github.dockerjava.api.command.CreateContainerResponse;
import com.github.dockerjava.api.command.InspectContainerResponse;
import com.github.dockerjava.api.model.Frame;
import com.github.dockerjava.api.model.StreamType;
import org.junit.Assume;
Expand All @@ -26,8 +25,8 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.emptyString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Expand All @@ -51,20 +50,17 @@ public void attachContainerWithStdin() throws Exception {
String snippet = "hello world";

CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
.withCmd("/bin/sh", "-c", "sleep 1 && read line && echo $line")
.withTty(false)
.withStdinOpen(true)
.exec();
.withCmd("/bin/sh", "-c", "read line && echo $line")
.withTty(false)
.withAttachStdin(true)
.withAttachStdout(true)
.withAttachStderr(true)
.withStdinOpen(true)
.exec();

LOG.info("Created container: {}", container.toString());
assertThat(container.getId(), not(is(emptyString())));

dockerClient.startContainerCmd(container.getId()).exec();

InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();

assertThat(inspectContainerResponse.getState().getRunning(), is(true));

AttachContainerTestCallback callback = new AttachContainerTestCallback() {
@Override
public void onNext(Frame frame) {
Expand All @@ -75,7 +71,7 @@ public void onNext(Frame frame) {

try (
PipedOutputStream out = new PipedOutputStream();
PipedInputStream in = new PipedInputStream(out);
PipedInputStream in = new PipedInputStream(out)
) {
dockerClient.attachContainerCmd(container.getId())
.withStdErr(true)
Expand All @@ -84,6 +80,8 @@ public void onNext(Frame frame) {
.withStdIn(in)
.exec(callback);

dockerClient.startContainerCmd(container.getId()).exec();

out.write((snippet + "\n").getBytes());
out.flush();

Expand All @@ -101,30 +99,33 @@ public void attachContainerWithoutTTY() throws Exception {
String snippet = "hello world";

CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
.withCmd("echo", snippet)
.withTty(false)
.exec();
.withCmd("echo", snippet)
.withTty(false)
.withAttachStdout(true)
.withAttachStderr(true)
.exec();

LOG.info("Created container: {}", container.toString());
assertThat(container.getId(), not(is(emptyString())));

dockerClient.startContainerCmd(container.getId()).exec();

AttachContainerTestCallback callback = new AttachContainerTestCallback() {
@Override
public void onNext(Frame frame) {
assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT));
super.onNext(frame);
};
}
};

dockerClient.attachContainerCmd(container.getId())
.withStdErr(true)
.withStdOut(true)
.withFollowStream(true)
.withLogs(true)
.exec(callback)
.awaitCompletion(30, TimeUnit.SECONDS);
.withStdErr(true)
.withStdOut(true)
.withFollowStream(true)
.withLogs(true)
.exec(callback);

dockerClient.startContainerCmd(container.getId()).exec();

callback.awaitCompletion(30, TimeUnit.SECONDS);
callback.close();

assertThat(callback.toString(), containsString(snippet));
Expand All @@ -135,31 +136,37 @@ public void attachContainerWithTTY() throws Exception {
DockerClient dockerClient = dockerRule.getClient();

File baseDir = new File(Thread.currentThread().getContextClassLoader()
.getResource("attachContainerTestDockerfile").getFile());
.getResource("attachContainerTestDockerfile").getFile());

String imageId = dockerRule.buildImage(baseDir);

CreateContainerResponse container = dockerClient.createContainerCmd(imageId).withTty(true).exec();
CreateContainerResponse container = dockerClient.createContainerCmd(imageId)
.withTty(true)
.withAttachStdout(true)
.withAttachStderr(true)
.exec();

LOG.info("Created container: {}", container.toString());
assertThat(container.getId(), not(is(emptyString())));

dockerClient.startContainerCmd(container.getId()).exec();

AttachContainerTestCallback callback = new AttachContainerTestCallback() {
@Override
public void onNext(Frame frame) {
assertThat(frame.getStreamType(), equalTo(StreamType.RAW));
super.onNext(frame);
};
}
};

dockerClient.attachContainerCmd(container.getId())
.withStdErr(true)
.withStdOut(true)
.withFollowStream(true)
.exec(callback)
.awaitCompletion(15, TimeUnit.SECONDS);
.withStdErr(true)
.withStdOut(true)
.withFollowStream(true)
.exec(callback);

dockerClient.startContainerCmd(container.getId()).exec();

callback.awaitCompletion(15, TimeUnit.SECONDS);
callback.close();

LOG.debug("log: {}", callback.toString());
Expand All @@ -178,33 +185,37 @@ public void attachContainerStdinUnsupported() throws Exception {
String snippet = "hello world";

CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
.withCmd("echo", snippet)
.withTty(false)
.exec();
.withCmd("echo", snippet)
.withTty(false)
.withAttachStdin(true)
.withAttachStdout(true)
.withAttachStderr(true)
.exec();

LOG.info("Created container: {}", container.toString());
assertThat(container.getId(), not(is(emptyString())));

dockerClient.startContainerCmd(container.getId()).exec();

AttachContainerTestCallback callback = new AttachContainerTestCallback() {
@Override
public void onNext(Frame frame) {
assertThat(frame.getStreamType(), equalTo(StreamType.STDOUT));
super.onNext(frame);
};
}
};

InputStream stdin = new ByteArrayInputStream("".getBytes());

dockerClient.attachContainerCmd(container.getId())
.withStdErr(true)
.withStdOut(true)
.withFollowStream(true)
.withLogs(true)
.withStdIn(stdin)
.exec(callback)
.awaitCompletion(30, TimeUnit.SECONDS);
.withStdErr(true)
.withStdOut(true)
.withFollowStream(true)
.withLogs(true)
.withStdIn(stdin)
.exec(callback);

dockerClient.startContainerCmd(container.getId()).exec();

callback.awaitCompletion(30, TimeUnit.SECONDS);
callback.close();
}

Expand All @@ -217,33 +228,35 @@ public void attachContainerClosesStdoutWhenContainerExits() throws Exception {
DockerClient dockerClient = dockerRule.getClient();

CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
.withCmd("echo", "hello")
.withTty(false)
.exec();
.withCmd("echo", "hello")
.withTty(false)
.withAttachStdout(true)
.withAttachStderr(true)
.exec();
LOG.info("Created container: {}", container.toString());

CountDownLatch gotLine = new CountDownLatch(1);
try (
ResultCallback.Adapter<Frame> resultCallback = dockerClient.attachContainerCmd(container.getId())
.withStdOut(true)
.withStdErr(true)
.withFollowStream(true)
.exec(new ResultCallback.Adapter<Frame>() {
@Override
public void onNext(Frame item) {
LOG.info("Got frame: {}", item);
if (item.getStreamType() == StreamType.STDOUT) {
gotLine.countDown();
}
super.onNext(item);
}

@Override
public void onComplete() {
LOG.info("On complete");
super.onComplete();
}
})
ResultCallback.Adapter<Frame> resultCallback = dockerClient.attachContainerCmd(container.getId())
.withStdOut(true)
.withStdErr(true)
.withFollowStream(true)
.exec(new ResultCallback.Adapter<Frame>() {
@Override
public void onNext(Frame item) {
LOG.info("Got frame: {}", item);
if (item.getStreamType() == StreamType.STDOUT) {
gotLine.countDown();
}
super.onNext(item);
}

@Override
public void onComplete() {
LOG.info("On complete");
super.onComplete();
}
})
) {
resultCallback.awaitStarted(5, SECONDS);
LOG.info("Attach started");
Expand All @@ -258,7 +271,7 @@ public void onComplete() {
}

public static class AttachContainerTestCallback extends ResultCallback.Adapter<Frame> {
private StringBuffer log = new StringBuffer();
private final StringBuffer log = new StringBuffer();

@Override
public void onNext(Frame item) {
Expand Down
2 changes: 1 addition & 1 deletion docker-java/src/test/resources/attachContainerTestDockerfile/echo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
while sleep 2; do echo stdout && echo stderr >&2; done
echo stdout && echo stderr >&2