Skip to content

Commit b11e3fe

Browse files
committed
Fix travis build vs docker-toolbox.
1 parent 21b0a10 commit b11e3fe

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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/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)