remove retry in test

Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>

test/integration/api/cp.bats

@@ -19,8 +19,7 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 500
 
 	# make sure container is up
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# grab the checksum of the test file inside the container.
 	run docker_swarm exec test_container md5sum $test_file

test/integration/api/diff.bats

@@ -13,8 +13,7 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 500
 
 	# make sure container is up
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# no changes
 	run docker_swarm diff test_container

test/integration/api/exec.bats

@@ -20,8 +20,7 @@ function teardown() {
 	docker_swarm start test_container
 
 	# make sure container is up and not paused
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	run docker_swarm exec test_container echo foobar
 	[ "$status" -eq 0 ]

test/integration/api/kill.bats

@@ -14,14 +14,12 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 1000
 
 	# make sure container is up before killing
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# kill
 	docker_swarm kill test_container
 
 	# verify
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=exited) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=exited) ]
 	[ $(docker_swarm inspect -f '{{ .State.ExitCode }}' test_container) -eq 137 ] 
 }

test/integration/api/pause.bats

@@ -16,12 +16,10 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 1000
 
 	# make sure container is up
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	docker_swarm pause test_container
 
 	# verify
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=paused) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=paused) ]
 }

test/integration/api/port.bats

@@ -13,8 +13,7 @@ function teardown() {
 	docker_swarm run -d -p 8000 --name test_container busybox sleep 500
 
 	# make sure container is up
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# port verify
 	run docker_swarm port test_container

test/integration/api/restart.bats

@@ -14,8 +14,7 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 1000
 
 	# make sure container is up
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# Keep track of when the container was started.
 	local started_at=$(docker_swarm inspect -f '{{ .State.StartedAt }}' test_container)
@@ -25,7 +24,6 @@ function teardown() {
 
 	# verify
 	run docker_swarm ps -l
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 	[ "$(docker_swarm inspect -f '{{ .State.StartedAt }}' test_container)" != "$started_at" ]
 }

test/integration/api/rm.bats

@@ -32,8 +32,7 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 500
 
 	# make sure container exsists and is up
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# rm, remove a running container, return error
 	run docker_swarm rm test_container

test/integration/api/run.bats

@@ -19,6 +19,5 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 100
 
 	# verify, container is running
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 }

test/integration/api/start.bats

@@ -23,6 +23,5 @@ function teardown() {
 	docker_swarm start test_container
 
 	# Verify
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 }

test/integration/api/stats.bats

@@ -16,8 +16,7 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 50
 
 	# make sure container is up
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# storage the stats output in TEMP_FILE
 	# it will stop automatically when manager stop

test/integration/api/stop.bats

@@ -14,13 +14,11 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 500
 
 	# make sure container is up before stop
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# stop
 	docker_swarm stop test_container
 
 	# verify
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=exited) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=exited) ]
 }

test/integration/api/top.bats

@@ -14,8 +14,7 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 500
 
 	# make sure container is running
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	run docker_swarm top test_container
 	[ "$status" -eq 0 ]

test/integration/api/unpause.bats

@@ -14,19 +14,16 @@ function teardown() {
 	docker_swarm run -d --name test_container busybox sleep 1000
 
 	# make sure container is up
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 
 	# pause
 	docker_swarm pause test_container
 
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=paused) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=paused) ]
 
 	# unpause
 	docker_swarm unpause test_container
 
 	# verify
-	# FIXME(#748): Retry required because of race condition.
-	retry 5 0.5 eval "[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]"
+	[ -n $(docker_swarm ps -q --filter=name=test_container --filter=status=running) ]
 }