kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Properly fix "daemon kill" on test failure

Browse source 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
This commit is contained in:
Tianon Gravi 2015-01-13 21:09:11 -07:00
parent 0db6bb3cbf
commit c18fdc3704
2 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
project/make/test-docker-py
View file

@ -7,15 +7,24 @@ DEST=$1
( (
source "$(dirname "$BASH_SOURCE")/.integration-daemon-start" source "$(dirname "$BASH_SOURCE")/.integration-daemon-start"
dockerPy='/docker-py' # we need to wrap up everything in between integration-daemon-start and
[ -d "$dockerPy" ] || { # integration-daemon-stop to make sure we kill the daemon and don't hang,
dockerPy="$DEST/docker-py" # even and especially on test failures
git clone https://github.com/docker/docker-py.git "$dockerPy" didFail=
} if ! {
dockerPy='/docker-py'
[ -d "$dockerPy" ] || {
dockerPy="$DEST/docker-py"
git clone https://github.com/docker/docker-py.git "$dockerPy"
}
cd "$dockerPy" export PYTHONPATH="$dockerPy" # import "docker" from our local docker-py
export PYTHONPATH=. # import "docker" from "." python "$dockerPy/tests/integration_test.py"
python tests/integration_test.py }; then
didFail=1
fi
source "$(dirname "$BASH_SOURCE")/.integration-daemon-stop" source "$(dirname "$BASH_SOURCE")/.integration-daemon-stop"
[ -z "$didFail" ] # "set -e" ftw
) 2>&1 | tee -a $DEST/test.log ) 2>&1 | tee -a $DEST/test.log

18
project/make/test-integration-cli
View file

@ -11,12 +11,22 @@ bundle_test_integration_cli() {
( (
source "$(dirname "$BASH_SOURCE")/.integration-daemon-start" source "$(dirname "$BASH_SOURCE")/.integration-daemon-start"
# pull the busybox image before running the tests # we need to wrap up everything in between integration-daemon-start and
sleep 2 # integration-daemon-stop to make sure we kill the daemon and don't hang,
# even and especially on test failures
didFail=
if ! {
# pull the busybox image before running the tests
sleep 2
source "$(dirname "$BASH_SOURCE")/.ensure-busybox" source "$(dirname "$BASH_SOURCE")/.ensure-busybox"
bundle_test_integration_cli bundle_test_integration_cli
}; then
didFail=1
fi
source "$(dirname "$BASH_SOURCE")/.integration-daemon-stop" source "$(dirname "$BASH_SOURCE")/.integration-daemon-stop"
[ -z "$didFail" ] # "set -e" ftw
) 2>&1 | tee -a $DEST/test.log ) 2>&1 | tee -a $DEST/test.log