Skip to content

Commit b9a93d4

Browse files
committed
Adapt test to not require docker socket access
1 parent 5b56f81 commit b9a93d4

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,14 @@ private FilePath downloadDocker(DumbSlave slave, FilePath toolDir, String versio
124124
assertThat(baos.toString(), not(containsString(Messages.DockerToolInstaller_downloading_docker_client_(version))));
125125
// Version check:
126126
baos.reset();
127-
assertEquals(0, slave.createLauncher(l).launch().cmds(exe.getRemote(), "version", "--format", "{{.Client.Version}}").quiet(true).stdout(tee).stderr(System.err).join());
128-
if (!version.equals("latest")) {
129-
assertEquals(version, baos.toString().trim());
127+
if (slave.createLauncher(l).launch().cmds(exe.getRemote(), "version", "--format", "{{.Client.Version}}").quiet(true).stdout(tee).stderr(tee).join() != 0) {
128+
/* Failure message should mention /var/run/docker.sock */
129+
assertThat(baos.toString(), containsString("/var/run/docker.sock"));
130+
} else {
131+
/* Successful output should either be `latest` or include the docker version */
132+
if (!version.equals("latest")) {
133+
assertEquals(version, baos.toString().trim());
134+
}
130135
}
131136
return exe;
132137
}

0 commit comments

Comments
 (0)