From b85c2a65c656b0a273fe36897db960fc55a2cf5e Mon Sep 17 00:00:00 2001 From: Xian Chaobo Date: Thu, 26 Nov 2015 09:33:09 +0800 Subject: [PATCH] fix CI Signed-off-by: Xian Chaobo --- test/integration/api/import.bats | 1 + test/integration/api/ps.bats | 6 ++++-- test/integration/api/run.bats | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/integration/api/import.bats b/test/integration/api/import.bats index 6b21825e95..843aec0e49 100644 --- a/test/integration/api/import.bats +++ b/test/integration/api/import.bats @@ -47,6 +47,7 @@ function teardown() { swarm_manage temp_file=$(mktemp) + echo abc > $temp_file run docker_swarm import - < $temp_file [ "$status" -eq 1 ] diff --git a/test/integration/api/ps.bats b/test/integration/api/ps.bats index 013317b2d3..8f9fa27d60 100644 --- a/test/integration/api/ps.bats +++ b/test/integration/api/ps.bats @@ -52,11 +52,13 @@ 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 1 ] + [ "${#lines[@]}" -eq 2 ] run docker_swarm ps --before c2 - [ "${#lines[@]}" -eq 2 ] + [ "${#lines[@]}" -eq 3 ] run docker_swarm ps --before c3 [ "$status" -eq 1 ] diff --git a/test/integration/api/run.bats b/test/integration/api/run.bats index 9603fd4e03..523e2fa62e 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:latest not found"* ]] + [[ "${output}" == *"busyboxabcde not found"* ]] } @test "docker run - with not exist volume driver" {