mirror of https://github.com/docker/docs.git
integration: Fix pause test and make sure the cleanup is done properly.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
parent
4bb035e41a
commit
a0973e6f91
|
@ -3,6 +3,8 @@
|
||||||
load ../helpers
|
load ../helpers
|
||||||
|
|
||||||
function teardown() {
|
function teardown() {
|
||||||
|
# if the state of the container is paused, it can't be removed(rm -f)
|
||||||
|
run docker_swarm unpause test_container
|
||||||
swarm_manage_cleanup
|
swarm_manage_cleanup
|
||||||
stop_docker
|
stop_docker
|
||||||
}
|
}
|
||||||
|
@ -22,9 +24,6 @@ function teardown() {
|
||||||
|
|
||||||
# verify
|
# verify
|
||||||
# FIXME(#748): Retry required because of race condition.
|
# FIXME(#748): Retry required because of race condition.
|
||||||
retry 5 0.5 eval "[ $(docker_swarm inspect -f '{{ .State.Paused }}' test_container) == 'true ']"
|
retry 5 0.5 eval "[ $(docker_swarm inspect -f '{{ .State.Paused }}' test_container) == 'true']"
|
||||||
[ docker_swarm inspect -f '{{ .State.Running }}' test_container == 'false' ]
|
[ docker_swarm inspect -f '{{ .State.Running }}' test_container == 'false' ]
|
||||||
|
|
||||||
# if the state of the container is paused, it can't be removed(rm -f)
|
|
||||||
docker_swarm unpause test_container
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue