From 1187069407d7812e83605f9c4b10a1badc7debea Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Tue, 5 May 2015 00:06:52 -0700
Subject: [PATCH] integration: fix nodes patterns in docker_swarm info

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
---
 test/integration/api.bats             | 3 ++-
 test/integration/file-discovery.bats  | 2 +-
 test/integration/helpers.bash         | 2 +-
 test/integration/token-discovery.bats | 3 ++-
 test/integration/zk-discovery.bats    | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/integration/api.bats b/test/integration/api.bats
index 8cb9434efd..27612f9555 100644
--- a/test/integration/api.bats
+++ b/test/integration/api.bats
@@ -321,7 +321,8 @@ function teardown() {
 	swarm_manage
 	run docker_swarm info
 	[ "$status" -eq 0 ]
-	[[ "${output}" == *"Nodes: 1 "* ]]
+	echo $output
+	[[ "${output}" == *"Nodes: 1"* ]]
 	[[ "${output}" == *"└ Labels:"*"foo=bar"* ]]
 }
 
diff --git a/test/integration/file-discovery.bats b/test/integration/file-discovery.bats
index 75f62346c1..d2ca80a658 100644
--- a/test/integration/file-discovery.bats
+++ b/test/integration/file-discovery.bats
@@ -24,5 +24,5 @@ function setup_file_discovery() {
 
 	run docker_swarm info
 	[ "$status" -eq 0 ]
-	[[ "$output" == *"Nodes: 2 "* ]]
+	[[ "$output" == *"Nodes: 2"* ]]
 }
diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash
index 59fe6fd69d..76e85a7798 100644
--- a/test/integration/helpers.bash
+++ b/test/integration/helpers.bash
@@ -100,7 +100,7 @@ function swarm_join() {
 		SWARM_JOIN_PID[$i]=$!
 		((++i))
 	done
-	retry 30 1 [ -n $(docker_swarm info | grep -q "Nodes: $i") ]
+	retry 30 1 [ -n "$(docker_swarm info | grep -q 'Nodes: $i')" ]
 }
 
 # Stops the manager.
diff --git a/test/integration/token-discovery.bats b/test/integration/token-discovery.bats
index b818eb49c8..126424ca20 100644
--- a/test/integration/token-discovery.bats
+++ b/test/integration/token-discovery.bats
@@ -23,7 +23,8 @@ function teardown() {
 	swarm_join   token://$TOKEN
 
 	run docker_swarm info
-	[[ "$output" == *"Nodes: 2 "* ]]
+	echo $output
+	[[ "$output" == *"Nodes: 2"* ]]
 
 	token_cleanup $TOKEN
 }
diff --git a/test/integration/zk-discovery.bats b/test/integration/zk-discovery.bats
index 8aaf2514cd..c21f3daed7 100644
--- a/test/integration/zk-discovery.bats
+++ b/test/integration/zk-discovery.bats
@@ -31,5 +31,5 @@ function teardown() {
 	swarm_join   zk://${ZK_HOST}/test
 
 	run docker_swarm info
-	[[ "$output" == *"Nodes: 1 "* ]]
+	[[ "$output" == *"Nodes: 1"* ]]
 }