Fix tests

hacfi · hacfi · commit 1c9aa592eb9f · 2015-01-25T06:47:57.000+01:00
diff --git a/src/Docker/Manager/ImageManager.php b/src/Docker/Manager/ImageManager.php
@@ -162,7 +162,10 @@ public function pull($name, $tag = 'latest', callable $callback = null)
         }
 
         $image = new Image($name, $tag);
-        $this->inspect($image);
+        $data = $this->inspect($image);
+        if (!$image->getId()) {
+            $image->setId($data['Id']);
+        }
 
         return $image;
     }
diff --git a/src/Docker/Tests/Context/context-test/Dockerfile b/src/Docker/Tests/Context/context-test/Dockerfile
@@ -1,3 +1,3 @@
-FROM base
+FROM busybox
 
 RUN echo 'hello world'
diff --git a/src/Docker/Tests/Manager/ImageManagerTest.php b/src/Docker/Tests/Manager/ImageManagerTest.php
@@ -37,10 +37,10 @@ public function testFindInexistant()
     public function testPull()
     {
         $manager = $this->getManager();
-        $image = $manager->pull('ubuntu', 'precise');
+        $image = $manager->pull('ubuntu', 'vivid');
 
         $this->assertEquals('ubuntu', $image->getRepository());
-        $this->assertEquals('precise', $image->getTag());
+        $this->assertEquals('vivid', $image->getTag());
         $this->assertNotNull($image->getId());
     }
 
@@ -56,7 +56,7 @@ public function testDelete()
     {
         $manager = $this->getManager();
 
-        $image = $manager->find('ubuntu', 'precise');
+        $image = $manager->find('ubuntu', 'vivid');
         $manager->delete($image, true);
 
         $this->setExpectedException('\\Docker\\Exception\\ImageNotFoundException', 'Image not found');

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,10 @@ public function pull($name, $tag = 'latest', callable $callback = null)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`$image = new Image($name, $tag);`
`165`		`- $this->inspect($image);`
	`165`	`+ $data = $this->inspect($image);`
	`166`	`+ if (!$image->getId()) {`
	`167`	`+ $image->setId($data['Id']);`
	`168`	`+ }`
`166`	`169`
`167`	`170`	`return $image;`
`168`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-FROM base`
	`1`	`+FROM busybox`
`2`	`2`
`3`	`3`	`RUN echo 'hello world'`
Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ public function testFindInexistant()`
`37`	`37`	`public function testPull()`
`38`	`38`	`{`
`39`	`39`	`$manager = $this->getManager();`
`40`		`- $image = $manager->pull('ubuntu', 'precise');`
	`40`	`+ $image = $manager->pull('ubuntu', 'vivid');`
`41`	`41`
`42`	`42`	`$this->assertEquals('ubuntu', $image->getRepository());`
`43`		`- $this->assertEquals('precise', $image->getTag());`
	`43`	`+ $this->assertEquals('vivid', $image->getTag());`
`44`	`44`	`$this->assertNotNull($image->getId());`
`45`	`45`	`}`
`46`	`46`
`@@ -56,7 +56,7 @@ public function testDelete()`
`56`	`56`	`{`
`57`	`57`	`$manager = $this->getManager();`
`58`	`58`
`59`		`- $image = $manager->find('ubuntu', 'precise');`
	`59`	`+ $image = $manager->find('ubuntu', 'vivid');`
`60`	`60`	`$manager->delete($image, true);`
`61`	`61`
`62`	`62`	`$this->setExpectedException('\\Docker\\Exception\\ImageNotFoundException', 'Image not found');`