Polish tests for WaitContainerCmd

&#321;ukasz Warcha&#322; · &#321;ukasz Warcha&#322; · commit f24fc2613d4b · 2016-05-06T13:12:57.000+02:00
Reduce containers sleep duration to 10 seconds.
Remove unnecessary calls to KillContainerCmd.
diff --git a/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java b/src/test/java/com/github/dockerjava/core/command/WaitContainerCmdImplTest.java
@@ -106,7 +106,7 @@ public void testWaitContainerAbort() throws Exception {
     @Test
     public void testWaitContainerTimeout() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "10").exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -121,12 +121,5 @@ public void testWaitContainerTimeout() throws Exception {
         } catch(DockerClientException e){
             LOG.info(e.getMessage());
         }
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java b/src/test/java/com/github/dockerjava/netty/exec/WaitContainerCmdExecTest.java
@@ -109,7 +109,7 @@ public void testWaitContainerAbort() throws Exception {
     @Test
     public void testWaitContainerTimeout() throws Exception {
 
-        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
+        CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "10").exec();
 
         LOG.info("Created container: {}", container.toString());
         assertThat(container.getId(), not(isEmptyString()));
@@ -124,12 +124,5 @@ public void testWaitContainerTimeout() throws Exception {
         } catch(DockerClientException e){
             LOG.info(e.getMessage());
         }
-
-        dockerClient.killContainerCmd(container.getId()).exec();
-
-        InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();
-        LOG.info("Container Inspect: {}", inspectContainerResponse.toString());
-
-        assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public void testWaitContainerAbort() throws Exception {`
`106`	`106`	`@Test`
`107`	`107`	`public void testWaitContainerTimeout() throws Exception {`
`108`	`108`
`109`		`- CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();`
	`109`	`+ CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "10").exec();`
`110`	`110`
`111`	`111`	`LOG.info("Created container: {}", container.toString());`
`112`	`112`	`assertThat(container.getId(), not(isEmptyString()));`
`@@ -121,12 +121,5 @@ public void testWaitContainerTimeout() throws Exception {`
`121`	`121`	`} catch(DockerClientException e){`
`122`	`122`	`LOG.info(e.getMessage());`
`123`	`123`	`}`
`124`		`-`
`125`		`- dockerClient.killContainerCmd(container.getId()).exec();`
`126`		`-`
`127`		`- InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();`
`128`		`- LOG.info("Container Inspect: {}", inspectContainerResponse.toString());`
`129`		`-`
`130`		`- assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));`
`131`	`124`	`}`
`132`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void testWaitContainerAbort() throws Exception {`
`109`	`109`	`@Test`
`110`	`110`	`public void testWaitContainerTimeout() throws Exception {`
`111`	`111`
`112`		`- CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();`
	`112`	`+ CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "10").exec();`
`113`	`113`
`114`	`114`	`LOG.info("Created container: {}", container.toString());`
`115`	`115`	`assertThat(container.getId(), not(isEmptyString()));`
`@@ -124,12 +124,5 @@ public void testWaitContainerTimeout() throws Exception {`
`124`	`124`	`} catch(DockerClientException e){`
`125`	`125`	`LOG.info(e.getMessage());`
`126`	`126`	`}`
`127`		`-`
`128`		`- dockerClient.killContainerCmd(container.getId()).exec();`
`129`		`-`
`130`		`- InspectContainerResponse inspectContainerResponse = dockerClient.inspectContainerCmd(container.getId()).exec();`
`131`		`- LOG.info("Container Inspect: {}", inspectContainerResponse.toString());`
`132`		`-`
`133`		`- assertThat(inspectContainerResponse.getState().getRunning(), is(equalTo(false)));`
`134`	`127`	`}`
`135`	`128`	`}`