Skip to content

Commit 3436a3f

Browse files
committed
Use separate stream for stderr
1 parent c0851c9 commit 3436a3f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/test/java/org/jenkinsci/plugins/docker/commons/tools/DockerToolInstallerTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ private FilePath downloadDocker(DumbSlave slave, FilePath toolDir, String versio
111111
ByteArrayOutputStream baos = new ByteArrayOutputStream();
112112
TeeOutputStream tee = new TeeOutputStream(baos, new PlainTextConsoleOutputStream(System.err));
113113
TaskListener l = new StreamTaskListener(tee);
114+
ByteArrayOutputStream errStream = new ByteArrayOutputStream();
114115

115116
FilePath exe = toolDir.child(version+"/bin/docker");
116117
// Download for first time:
@@ -124,9 +125,9 @@ private FilePath downloadDocker(DumbSlave slave, FilePath toolDir, String versio
124125
assertThat(baos.toString(), not(containsString(Messages.DockerToolInstaller_downloading_docker_client_(version))));
125126
// Version check:
126127
baos.reset();
127-
if (slave.createLauncher(l).launch().cmds(exe.getRemote(), "version", "--format", "{{.Client.Version}}").quiet(true).stdout(tee).stderr(tee).join() != 0) {
128+
if (slave.createLauncher(l).launch().cmds(exe.getRemote(), "version", "--format", "{{.Client.Version}}").quiet(true).stdout(tee).stderr(errStream).join() != 0) {
128129
/* Failure message should mention /var/run/docker.sock */
129-
assertThat(baos.toString(), containsString("/var/run/docker.sock"));
130+
assertThat(errStream.toString(), containsString("/var/run/docker.sock"));
130131
} else {
131132
/* Successful output should either be `latest` or include the docker version */
132133
if (!version.equals("latest")) {

0 commit comments

Comments
 (0)