fix stable tests

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2015-12-22 00:03:59 -08:00
parent de0e67f571
commit c11d4fe82c
2 changed files with 6 additions and 7 deletions

View File

@ -52,13 +52,12 @@ function teardown() {
docker_swarm run -d --name c1 busybox echo c1 docker_swarm run -d --name c1 busybox echo c1
docker_swarm run -d --name c2 busybox echo c2 docker_swarm run -d --name c2 busybox echo c2
# the result of `ps --before` include a Warning messsage: run eval "docker_swarm ps --before c1 2>/dev/null"
# Warning: '--before' is deprecated, it will be removed soon. See usage echo $output
run docker_swarm ps --before c1 [ "${#lines[@]}" -eq 1 ]
[ "${#lines[@]}" -eq 2 ]
run docker_swarm ps --before c2 run eval "docker_swarm ps --before c2 2>/dev/null"
[ "${#lines[@]}" -eq 3 ] [ "${#lines[@]}" -eq 2 ]
run docker_swarm ps --before c3 run docker_swarm ps --before c3
[ "$status" -eq 1 ] [ "$status" -eq 1 ]

View File

@ -142,7 +142,7 @@ function teardown() {
# check error message # check error message
[[ "${output}" != *"unable to find a node that satisfies"* ]] [[ "${output}" != *"unable to find a node that satisfies"* ]]
[[ "${output}" == *"busyboxabcde not found"* ]] [[ "${output}" == *"not found"* ]]
} }
@test "docker run - with not exist volume driver" { @test "docker run - with not exist volume driver" {