From f5187e99382e174764189b87801693148ddcdd98 Mon Sep 17 00:00:00 2001 From: Dong Chen Date: Mon, 29 Feb 2016 13:48:59 -0800 Subject: [PATCH] Remove internal retry in discovery_check_swarm_info because caller retries are already in place. Signed-off-by: Dong Chen --- test/integration/discovery/zk.bats | 4 ++++ test/integration/helpers.bash | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/integration/discovery/zk.bats b/test/integration/discovery/zk.bats index 825b02e2a3..68d865b8b9 100644 --- a/test/integration/discovery/zk.bats +++ b/test/integration/discovery/zk.bats @@ -85,6 +85,8 @@ function teardown() { # Check that we can add instances back to the cluster start_docker 2 swarm_join "$DISCOVERY" + run docker_swarm info + echo $output retry 10 1 discovery_check_swarm_info 2 } @@ -106,5 +108,7 @@ function teardown() { # After a while, `join` and `manage` should reach the store. retry 20 1 discovery_check_swarm_list "$DISCOVERY" + run docker_swarm info + echo $output retry 20 1 discovery_check_swarm_info } diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash index 3468aaff6a..00cae1da63 100644 --- a/test/integration/helpers.bash +++ b/test/integration/helpers.bash @@ -92,7 +92,7 @@ function discovery_check_swarm_info() { local host="$2" [ -z "$host" ] && host="${SWARM_HOSTS[0]}" - retry 10 1 eval "docker -H $host info | grep -q -e \"Nodes: $total\" -e \"Offers: $total\"" + eval "docker -H $host info | grep -q -e \"Nodes: $total\" -e \"Offers: $total\"" } # Return true if all nodes has been validated @@ -107,7 +107,7 @@ function swarm_manage() { swarm_manage_no_wait "$@" # Wait for nodes to be discovered - discovery_check_swarm_info "${#HOSTS[@]}" "${SWARM_HOSTS[$i]}" + retry 10 1 discovery_check_swarm_info "${#HOSTS[@]}" "${SWARM_HOSTS[$i]}" # All nodes passes pending state retry 15 1 nodes_validated