discovery integration: fix for docker master

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

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 "* ]]
 }

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
 }

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 "* ]]
 }