Merge branch 'master' of https://github.com/NirmataOSS/docker-java

patelrit · patelrit · commit 622071e4bee3 · 2014-07-14T22:14:38.000-07:00
Conflicts:

src/test/java/com/github/dockerjava/client/command/StartContainerCmdTest
.java
diff --git a/src/test/java/com/github/dockerjava/client/command/StartContainerCmdTest.java b/src/test/java/com/github/dockerjava/client/command/StartContainerCmdTest.java
@@ -83,6 +83,7 @@ public void startContainerWithVolumes() throws DockerException {
 		containerInspectResponse = dockerClient.inspectContainerCmd(container
 				.getId()).exec();
 		
+
 		assertThat(Arrays.asList(containerInspectResponse.getVolumes()),
 				contains(volume1, volume2));
 
@@ -100,7 +101,7 @@ public void startContainerWithPortBindings() throws DockerException {
 		
 		ContainerCreateResponse container = dockerClient
 				.createContainerCmd("busybox")
-				.withCmd("true").withExposedPorts(tcp22, tcp23).exec();
+				.withCmd("top").withExposedPorts(tcp22, tcp23).exec();
 
 		LOG.info("Created container {}", container.toString());
 
@@ -117,6 +118,8 @@ public void startContainerWithPortBindings() throws DockerException {
 
 		containerInspectResponse = dockerClient.inspectContainerCmd(container
 				.getId()).exec();
+
+		assertThat(containerInspectResponse.getState().isRunning(), is(true));
 		
 		assertThat(Arrays.asList(containerInspectResponse.getConfig().getExposedPorts()),
 				contains(tcp22, tcp23));
@@ -190,7 +193,7 @@ public void startContainerWithLinking() throws DockerException {
 	public void startContainer() throws DockerException {
 
 		ContainerCreateResponse container = dockerClient
-				.createContainerCmd("busybox").withCmd("true").exec();
+			.createContainerCmd("busybox").withCmd(new String[] { "top" }).exec();
 		
 		LOG.info("Created container {}", container.toString());
 		assertThat(container.getId(), not(isEmptyString()));
