From 2605eff5fcfb1982043e4467ab3d7665788b64f1 Mon Sep 17 00:00:00 2001
From: Andrea Luzzardi <aluzzardi@gmail.com>
Date: Mon, 4 May 2015 23:17:18 -0700
Subject: [PATCH] discovery integration: fix for docker master

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

diff --git a/test/integration/file-discovery.bats b/test/integration/file-discovery.bats
index 0341f0e5cf..75f62346c1 100644
--- a/test/integration/file-discovery.bats
+++ b/test/integration/file-discovery.bats
@@ -17,12 +17,12 @@ function setup_file_discovery() {
 	done
 }
 
-@test "docker info should return the number of nodes with file discovery" {
+@test "file discovery" {
 	start_docker 2
 	setup_file_discovery
 	swarm_manage file://$DISCOVERY_FILE
 
 	run docker_swarm info
 	[ "$status" -eq 0 ]
-	[[ "${lines[3]}" == *"Nodes: 2" ]]
+	[[ "$output" == *"Nodes: 2 "* ]]
 }
diff --git a/test/integration/token-discovery.bats b/test/integration/token-discovery.bats
index 8959e0066f..b818eb49c8 100644
--- a/test/integration/token-discovery.bats
+++ b/test/integration/token-discovery.bats
@@ -12,7 +12,7 @@ function teardown() {
 	stop_docker
 }
 
-@test "token discovery should be working properly" {
+@test "token discovery" {
 	start_docker 2
 
 	TOKEN=$(swarm create)
@@ -23,7 +23,7 @@ function teardown() {
 	swarm_join   token://$TOKEN
 
 	run docker_swarm info
-	[[ "${lines[3]}" == *"Nodes: 2"* ]]
+	[[ "$output" == *"Nodes: 2 "* ]]
 
 	token_cleanup $TOKEN
 }
diff --git a/test/integration/zk-discovery.bats b/test/integration/zk-discovery.bats
index 80bc75acf9..8aaf2514cd 100644
--- a/test/integration/zk-discovery.bats
+++ b/test/integration/zk-discovery.bats
@@ -23,7 +23,7 @@ function teardown() {
 	stop_zk
 }
 
-@test "zk discovery should be working correctly" {
+@test "zk discovery" {
 	start_zk
 	start_docker 1
 
@@ -31,5 +31,5 @@ function teardown() {
 	swarm_join   zk://${ZK_HOST}/test
 
 	run docker_swarm info
-	[[ "${lines[3]}" == *"Nodes: 1"* ]]
+	[[ "$output" == *"Nodes: 1 "* ]]
 }