From 010f28895110438ca4597857b38f8d9db50fa925 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 4 Apr 2014 19:06:55 +0300 Subject: [PATCH] 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 (github: unclejack) Upstream-commit: 22152ccc47e641050da85b80cebf2912b42fd122 Component: engine --- components/engine/hack/make/test-integration-cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/hack/make/test-integration-cli b/components/engine/hack/make/test-integration-cli index 1760171dd5..18e4ee6602 100644 --- a/components/engine/hack/make/test-integration-cli +++ b/components/engine/hack/make/test-integration-cli @@ -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 )