cli integration: fix wait race

The wait at the end of cli integration script could end up failing if
the process had already exited. This was making it look like the tests
have failed.

This change fixes the problem.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 22152ccc47e641050da85b80cebf2912b42fd122
Component: engine
This commit is contained in:
unclejack
2014-04-04 19:06:55 +03:00
parent 3057a30784
commit 010f288951

View File

@ -31,5 +31,5 @@ bundle_test_integration_cli 2>&1 \
DOCKERD_PID=$(cat $DEST/docker.pid)
kill $DOCKERD_PID
wait $DOCKERD_PID
wait $DOCKERD_PID || true
)