Skip to content

Commit 04fa7e8

Browse files
KostyaShaKostyaSha
authored
Fix it2 (#621)
* Fix hasItem in test * Disable toolbox only tests
1 parent 4b2ffe2 commit 04fa7e8

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

‎src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import static org.hamcrest.Matchers.containsInAnyOrder;
4646
import static org.hamcrest.Matchers.containsString;
4747
import static org.hamcrest.Matchers.equalTo;
48+
import static org.hamcrest.Matchers.hasItem;
4849
import static org.hamcrest.Matchers.hasItemInArray;
4950
import static org.hamcrest.Matchers.is;
5051
import static org.hamcrest.Matchers.isEmptyString;
@@ -191,21 +192,24 @@ public void createContainerWithVolumesFrom() throws DockerException {
191192

192193
@Test
193194
public void createContainerWithEnv() throws Exception {
195+
final String testVariable = "VARIABLE=success";
194196

195-
CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE).withEnv("VARIABLE=success")
196-
.withCmd("env").exec();
197+
CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
198+
.withEnv(testVariable)
199+
.withCmd("env")
200+
.exec();
197201

198202
LOG.info("Created container {}", container.toString());
199203

200204
assertThat(container.getId(), not(isEmptyString()));
201205

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

204-
assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
208+
assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable));
205209

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

208-
assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
212+
assertThat(containerLog(container.getId()), containsString(testVariable));
209213
}
210214

211215
@Test

‎src/test/java/com/github/dockerjava/core/command/UpdateContainerCmdImplTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ public void updateContainer() throws DockerException, IOException {
8484
// .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
8585
.exec();
8686

87-
// docker toolbox 1.10.1
88-
assertThat(updateResponse.getWarnings(), hasSize(1));
89-
assertThat(updateResponse.getWarnings().get(0),
90-
is("Your kernel does not support Block I/O weight. Weight discarded."));
87+
// true only on docker toolbox (1.10.1)
88+
// assertThat(updateResponse.getWarnings(), hasSize(1));
89+
// assertThat(updateResponse.getWarnings().get(0),
90+
// is("Your kernel does not support Block I/O weight. Weight discarded."));
9191

9292
InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
9393
final HostConfig afterHostConfig = inspectAfter.getHostConfig();

‎src/test/java/com/github/dockerjava/netty/exec/CreateContainerCmdExecTest.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import static org.hamcrest.Matchers.containsInAnyOrder;
4444
import static org.hamcrest.Matchers.containsString;
4545
import static org.hamcrest.Matchers.equalTo;
46+
import static org.hamcrest.Matchers.hasItem;
4647
import static org.hamcrest.Matchers.hasItemInArray;
4748
import static org.hamcrest.Matchers.is;
4849
import static org.hamcrest.Matchers.isEmptyString;
@@ -189,21 +190,24 @@ public void createContainerWithVolumesFrom() throws DockerException {
189190

190191
@Test
191192
public void createContainerWithEnv() throws Exception {
193+
final String testVariable = "VARIABLE=success";
192194

193-
CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withEnv("VARIABLE=success")
194-
.withCmd("env").exec();
195+
CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
196+
.withEnv(testVariable)
197+
.withCmd("env")
198+
.exec();
195199

196200
LOG.info("Created container {}", container.toString());
197201

198202
assertThat(container.getId(), not(isEmptyString()));
199203

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

202-
assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), containsInAnyOrder("VARIABLE=success"));
206+
assertThat(Arrays.asList(inspectContainerResponse.getConfig().getEnv()), hasItem(testVariable));
203207

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

206-
assertThat(containerLog(container.getId()), containsString("VARIABLE=success"));
210+
assertThat(containerLog(container.getId()), containsString(testVariable));
207211
}
208212

209213
@Test

‎src/test/java/com/github/dockerjava/netty/exec/UpdateContainerCmdExecTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ public void updateContainer() throws DockerException, IOException {
8383
// .withKernelMemory(52428800) Can not update kernel memory to a running container, please stop it first.
8484
.exec();
8585

86-
// docker toolbox 1.10.1
87-
assertThat(updateResponse.getWarnings(), hasSize(1));
88-
assertThat(updateResponse.getWarnings().get(0),
89-
is("Your kernel does not support Block I/O weight. Weight discarded."));
86+
// found only on docker toolbox (1.10.1)
87+
// assertThat(updateResponse.getWarnings(), hasSize(1));
88+
// assertThat(updateResponse.getWarnings().get(0),
89+
// is("Your kernel does not support Block I/O weight. Weight discarded."));
9090

9191
InspectContainerResponse inspectAfter = dockerClient.inspectContainerCmd(containerId).exec();
9292
final HostConfig afterHostConfig = inspectAfter.getHostConfig();

0 commit comments

Comments
 (0)