From 33dc4455eb811a42c7eb48186af043cfae3b9bdf Mon Sep 17 00:00:00 2001
From: Xian Chaobo <xianchaobo@huawei.com>
Date: Tue, 21 Apr 2015 22:33:57 +0800
Subject: [PATCH] bug fix

Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
---
 test/integration/api.bats | 59 ++++++++++-----------------------------
 1 file changed, 14 insertions(+), 45 deletions(-)

diff --git a/test/integration/api.bats b/test/integration/api.bats
index b5005e6419..696a0e7984 100644
--- a/test/integration/api.bats
+++ b/test/integration/api.bats
@@ -141,10 +141,15 @@ function teardown() {
 	swarm_manage
 
 	# no image exist
-	run docker_swarm images 
+	run docker_swarm images -q 
 	[ "$status" -eq 0 ]
-	[ "${#lines[@]}" -eq 1 ]
-	[[ "${lines[0]}" == *"REPOSITORY"* ]]
+	[ "${#lines[@]}" -eq 0 ]
+	# make sure every node has no image
+	for((i=0; i<3; i++)); do
+		run docker_swarm images --filter node=node-$i -q
+		[ "$status" -eq 0 ]
+		[ "${#lines[@]}" -eq 0 ]
+	done
 
 	# pull image
 	run docker_swarm pull busybox
@@ -161,38 +166,9 @@ function teardown() {
 	for((i=1; i<${#lines[@]}; i++)); do
 		[[ "${lines[i]}" == *"busybox"* ]]
 	done
-}
-
-@test "docker images --filter node=<Node name>" {
-	start_docker 3
-	swarm_manage
-
-	# no image exist
-	run docker_swarm images 
-	[ "$status" -eq 0 ]
-	[ "${#lines[@]}" -eq 1 ]
-	[[ "${lines[0]}" == *"REPOSITORY"* ]]
-
-	# make sure every node has no image
-	for((i=0;i<3;i++)); do
-		run docker_swarm images --filter node=node-$i
-		[ "$status" -eq 0 ]
-		[ "${#lines[@]}" -eq 1 ]
-		[[ "${lines[0]}" == *"REPOSITORY"* ]]
-	done
-
-	# pull image
-	run docker_swarm pull busybox
-	[ "$status" -eq 0 ]
-
-	# make sure images have pulled
-	run docker_swarm images
-	[ "$status" -eq 0 ]
-	[ "${#lines[@]}" -ge 4 ]
-	[[ "${lines[1]}" == *"busybox"* ]]
-
+	
 	# verify
-	for((i=0; i<3; i++)); do 
+	for((i=0; i<3; i++)); do
 		run docker_swarm images --filter node=node-$i
 		[ "$status" -eq 0 ]
 		[ "${#lines[@]}" -ge 2 ]
@@ -347,12 +323,6 @@ function teardown() {
 	[ "$status" -eq 0 ]
 	[ "${#lines[@]}" -eq 0 ]
 
-	for host in ${HOSTS[@]}; do
-		run docker -H $host images -q
-		[ "$status" -eq 0 ]
-		[ "${#lines[@]}" -eq 0 ]
-	done
-
 	run docker_swarm pull busybox
 	[ "$status" -eq 0 ]
 
@@ -581,18 +551,17 @@ function teardown() {
 	run docker_swarm images
 	[ "$status" -eq 0 ]
 	[ "${#lines[@]}" -ge 2 ]
-	[[ "${lines[*]}" == *"busybox"* ]]
-	[[ "${lines[*]}" != *"tag_busybox"* ]]
+	[[ "${output}" == *"busybox"* ]]
+	[[ "${output}" != *"tag_busybox"* ]]
 
 	# tag image
 	run docker_swarm tag busybox tag_busybox:test
 	[ "$status" -eq 0 ]
 
 	# verify
-	run docker_swarm images
+	run docker_swarm images tag_busybox
 	[ "$status" -eq 0 ]
-	[ "${#lines[@]}" -ge 2 ]
-	[[ "${lines[*]}" == *"tag_busybox"* ]]
+	[[ "${output}" == *"tag_busybox"* ]]
 }
 
 @test "docker top" {