1. docker
  2. Commit 22152ccc47e641050da85b80cebf2912b42fd122
Browse code

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)

unclejack authored on 2014/04/05 01:06:55
Showing 1 changed files
hack/make/test-integration-cli
History View file @ 22152cc
... ... 
@@ -31,5 +31,5 @@ bundle_test_integration_cli 2>&1 \
31 31
32 32 
 DOCKERD_PID=$(cat $DEST/docker.pid)
33 33 
 kill $DOCKERD_PID
34 
-wait $DOCKERD_PID
34 
+wait $DOCKERD_PID || true
35 35 
 )