Fix race condition where script was too slow to terminate in tests

joelwurtz · joelwurtz · commit 056a71d2afe6 · 2014-12-03T01:49:09.000+01:00
diff --git a/src/Docker/Tests/Manager/ContainerManagerTest.php b/src/Docker/Tests/Manager/ContainerManagerTest.php
@@ -479,9 +479,8 @@ public function testKill()
             return $value['output'];
         }, $logs);
 
-        $manager->stop($container);
+        $manager->wait($container);
         $manager->remove($container);
-
         $this->getDocker()->getImageManager()->delete($container->getImage());
 
         $this->assertContains('HUP', implode("", $logs));
diff --git a/src/Docker/Tests/Manager/script/kill.sh b/src/Docker/Tests/Manager/script/kill.sh
@@ -9,6 +9,7 @@ trap_with_arg() {
 
 func_trap() {
     echo $1
+    exit 0
 }
 
 trap_with_arg func_trap HUP INT TERM EXIT

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ trap_with_arg() {`
`9`	`9`
`10`	`10`	`func_trap() {`
`11`	`11`	`echo $1`
	`12`	`+ exit 0`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`trap_with_arg func_trap HUP INT TERM EXIT`