From c11d4fe82cbf1a049a94985c0d656f3f8c5caf23 Mon Sep 17 00:00:00 2001
From: Victor Vieux <vieux@docker.com>
Date: Tue, 22 Dec 2015 00:03:59 -0800
Subject: [PATCH] fix stable tests

Signed-off-by: Victor Vieux <vieux@docker.com>
---
 test/integration/api/ps.bats  | 11 +++++------
 test/integration/api/run.bats |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/integration/api/ps.bats b/test/integration/api/ps.bats
index 8f9fa27d60..1bfc61dccb 100644
--- a/test/integration/api/ps.bats
+++ b/test/integration/api/ps.bats
@@ -52,13 +52,12 @@ function teardown() {
 	docker_swarm run -d --name c1 busybox echo c1
 	docker_swarm run -d --name c2 busybox echo c2
 
-	# the result of `ps --before` include a Warning messsage:
-	# Warning: '--before' is deprecated, it will be removed soon. See usage
-	run docker_swarm ps --before c1
-	[ "${#lines[@]}" -eq  2 ]
+	run eval "docker_swarm ps --before c1 2>/dev/null"
+	echo $output
+	[ "${#lines[@]}" -eq  1 ]
 
-	run docker_swarm ps --before c2
-	[ "${#lines[@]}" -eq  3 ]
+	run eval "docker_swarm ps --before c2 2>/dev/null"
+	[ "${#lines[@]}" -eq  2 ]
 
 	run docker_swarm ps --before c3
 	[ "$status" -eq 1 ]
diff --git a/test/integration/api/run.bats b/test/integration/api/run.bats
index 0d1c6dc068..0a71db097f 100644
--- a/test/integration/api/run.bats
+++ b/test/integration/api/run.bats
@@ -142,7 +142,7 @@ function teardown() {
 
 	# check error message
 	[[ "${output}" != *"unable to find a node that satisfies"* ]]
-	[[ "${output}" == *"busyboxabcde not found"* ]]
+	[[ "${output}" == *"not found"* ]]
 }
 
 @test "docker run - with not exist volume driver" {