Recover fix to testPullImage from commit 2a6d92d, accidentally lost in 4ac45cd

hkampbjorn · hkampbjorn · commit a4103ca91a42 · 2014-04-29T23:07:53.000+02:00
diff --git a/src/main/java/com/kpelykh/docker/client/DockerClient.java b/src/main/java/com/kpelykh/docker/client/DockerClient.java
@@ -187,7 +187,7 @@ public ClientResponse pull(String repository, String tag, String registry) throw
 		Preconditions.checkNotNull(repository, "Repository was not specified");
 
 		if (StringUtils.countMatches(repository, ":") == 1) {
-			String repositoryTag[] = StringUtils.split(repository);
+			String repositoryTag[] = StringUtils.split(repository, ':');
 			repository = repositoryTag[0];
 			tag = repositoryTag[1];
 
diff --git a/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java b/src/test/java/com/kpelykh/docker/client/test/DockerClientTest.java
@@ -474,7 +474,11 @@ public void removeContainer() throws DockerException {
 	@Test
 	public void testPullImage() throws DockerException, IOException {
 
-		String testImage = "kpelykh/vimbase";
+		// This should be an image that is not used by other repositories already
+		// pulled down, preferably small in size. If tag is not used pull will
+		// download all images in that repository but tmpImgs will only
+		// deleted 'latest' image but not images with other tags
+		String testImage = "hackmann/empty";
 
 		LOG.info("Removing image: {}", testImage);
 		dockerClient.removeImage(testImage);
@@ -486,6 +490,7 @@ public void testPullImage() throws DockerException, IOException {
 
 		LOG.info("Pulling image: {}", testImage);
 
+		tmpImgs.add(testImage);
 		ClientResponse response = dockerClient.pull(testImage);
 
 		StringWriter logwriter = new StringWriter();
@@ -503,15 +508,12 @@ public void testPullImage() throws DockerException, IOException {
 		}
 
 		String fullLog = logwriter.toString();
-		assertThat(fullLog,
-				containsString("Pulling repository kpelykh/vimbase"));
-
-		tmpImgs.add(testImage);
+		assertThat(fullLog, containsString("Download complete"));
 
 		info = dockerClient.info();
 		LOG.info("Client info after pull, {}", info.toString());
 
-		assertThat(imgCount + 1, equalTo(info.getImages()));
+		assertThat(imgCount, lessThan(info.getImages()));
 
 		ImageInspectResponse imageInspectResponse = dockerClient
 				.inspectImage(testImage);
