Merge pull request #1626 from infosiftr/docker-dind

Update docker-dind to use three dind containers for a more interesting test
docker-library · Jul 6, 2016 · fc665da · fc665da
2 parents 8dcd0a8 + 81eba9a
commit fc665da
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/test/tests/docker-dind/run.sh b/test/tests/docker-dind/run.sh
@@ -24,14 +24,25 @@ docker_() {
 
 . "$dir/../../retry.sh" 'docker_ version'
 
+[ "$(docker_ images -q | wc -l)" = '0' ]
 docker_ pull busybox
+[ "$(docker_ images -q | wc -l)" = '1' ]
 
+[ "$(docker_ ps -aq | wc -l)" = '0' ]
+
+docker_ run --rm busybox true
+docker_ run --rm busybox true
 docker_ run --rm busybox true
 
-docker_ create -i --name test busybox cat
-[ "$(docker_ inspect -f '{{.State.Running}}' test)" = 'false' ]
-docker_ start test
-[ "$(docker_ inspect -f '{{.State.Running}}' test)" = 'true' ]
-docker_ stop test
-[ "$(docker_ inspect -f '{{.State.Running}}' test)" = 'false' ]
-docker_ rm test
+[ "$(docker_ ps -aq | wc -l)" = '0' ]
+docker_ create -i --name test1 busybox cat
+[ "$(docker_ ps -aq | wc -l)" = '1' ]
+
+[ "$(docker_ inspect -f '{{.State.Running}}' test1)" = 'false' ]
+docker_ start test1
+[ "$(docker_ inspect -f '{{.State.Running}}' test1)" = 'true' ]
+docker_ stop test1
+[ "$(docker_ inspect -f '{{.State.Running}}' test1)" = 'false' ]
+docker_ rm test1
+
+[ "$(docker_ ps -aq | wc -l)" = '0' ]