fix tests

Signed-off-by: Victor Vieux <vieux@docker.com>
docker-archive · Dec 8, 2015 · f1b7b7b · f1b7b7b
1 parent a17f182
commit f1b7b7b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/test/integration/discovery/consul.bats b/test/integration/discovery/consul.bats
@@ -99,7 +99,7 @@ function teardown() {
 	swarm_join "$DISCOVERY"
 
 	# Start a manager. It should keep retrying
-	swarm_manage "$DISCOVERY"
+	swarm_manage_no_wait "$DISCOVERY"
 
 	# Now start the store
 	start_store

diff --git a/test/integration/discovery/etcd.bats b/test/integration/discovery/etcd.bats
@@ -106,7 +106,7 @@ function teardown() {
 	swarm_join "$DISCOVERY"
 
 	# Start a manager. It should keep retrying
-	swarm_manage "$DISCOVERY"
+	swarm_manage_no_wait "$DISCOVERY"
 
 	# Now start the store
 	start_store

diff --git a/test/integration/discovery/file.bats b/test/integration/discovery/file.bats
@@ -82,7 +82,7 @@ function setup_discovery_file() {
 	start_docker 2
 
 	# Start a manager. It should keep retrying
-	swarm_manage "$DISCOVERY"
+	swarm_manage_no_wait "$DISCOVERY"
 
 	# Now create the discovery file.
 	setup_discovery_file

diff --git a/test/integration/discovery/zk.bats b/test/integration/discovery/zk.bats
@@ -99,7 +99,7 @@ function teardown() {
 	swarm_join "$DISCOVERY"
 
 	# Start a manager. It should keep retrying
-	swarm_manage "$DISCOVERY"
+	swarm_manage_no_wait "$DISCOVERY"
 
 	# Now start the store
 	start_store

diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash
@@ -95,8 +95,17 @@ function discovery_check_swarm_info() {
 	retry 10 1 eval "docker -H $host info | grep -q -e \"Nodes: $total\" -e \"Offers: $total\""
 }
 
-# Start the swarm manager in background.
 function swarm_manage() {
+	local i=${#SWARM_MANAGE_PID[@]}
+
+	swarm_manage_no_wait "$@"
+
+	# Wait for nodes to be discovered
+	discovery_check_swarm_info "${#HOSTS[@]}" "${SWARM_HOSTS[$i]}"
+}
+
+# Start the swarm manager in background.
+function swarm_manage_no_wait() {
 	local discovery
 	if [ $# -eq 0 ]; then
 		discovery=`join , ${HOSTS[@]}`
@@ -114,9 +123,6 @@ function swarm_manage() {
 
 	# Wait for the Manager to be reachable
 	wait_until_reachable "$host"
-
-	# Wait for nodes to be discovered
-	discovery_check_swarm_info "${#HOSTS[@]}" "$host"
 }
 
 # swarm join every engine created with `start_docker`.