From 62b08f557db91cc5cd12ea9ceb0a4d8cf3d6e0f1 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 4 Apr 2014 19:03:07 +0300 Subject: [PATCH 1/2] cli integration: allow driver selection via vars This makes it possible to choose the graphdriver and the execdriver which is going to be used for the cli integration tests. Docker-DCO-1.1-Signed-off-by: Cristian Staretu (github: unclejack) --- Makefile | 2 +- hack/make/test-integration-cli | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 776d57951f..d49aa3b667 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ DOCKER_IMAGE := docker$(if $(GIT_BRANCH),:$(GIT_BRANCH)) DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH)) DOCKER_MOUNT := $(if $(BINDDIR),-v "$(CURDIR)/$(BINDDIR):/go/src/github.com/dotcloud/docker/$(BINDDIR)") -DOCKER_RUN_DOCKER := docker run --rm -it --privileged -e TESTFLAGS $(DOCKER_MOUNT) "$(DOCKER_IMAGE)" +DOCKER_RUN_DOCKER := docker run --rm -it --privileged -e TESTFLAGS -e DOCKER_GRAPHDRIVER -e DOCKER_EXECDRIVER $(DOCKER_MOUNT) "$(DOCKER_IMAGE)" DOCKER_RUN_DOCS := docker run --rm -it -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" default: binary diff --git a/hack/make/test-integration-cli b/hack/make/test-integration-cli index 5c6fc367fc..1760171dd5 100644 --- a/hack/make/test-integration-cli +++ b/hack/make/test-integration-cli @@ -7,6 +7,8 @@ set -e # subshell so that we can export PATH without breaking other things ( export PATH="$DEST/../binary:$DEST/../dynbinary:$PATH" +DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs} +DOCKER_EXECDRIVER=${DOCKER_EXECDRIVER:-native} bundle_test_integration_cli() { go_test_dir ./integration-cli @@ -17,7 +19,8 @@ if ! command -v docker &> /dev/null; then false fi -docker -d -D -p $DEST/docker.pid &> $DEST/docker.log & +echo "running cli integration tests using graphdriver: '$DOCKER_GRAPHDRIVER' and execdriver: '$DOCKER_EXECDRIVER'" +docker -d -D -s $DOCKER_GRAPHDRIVER -e $DOCKER_EXECDRIVER -p $DEST/docker.pid &> $DEST/docker.log & # pull the busybox image before running the tests sleep 2 From 22152ccc47e641050da85b80cebf2912b42fd122 Mon Sep 17 00:00:00 2001 From: unclejack Date: Fri, 4 Apr 2014 19:06:55 +0300 Subject: [PATCH 2/2] 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) --- hack/make/test-integration-cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/make/test-integration-cli b/hack/make/test-integration-cli index 1760171dd5..18e4ee6602 100644 --- a/hack/make/test-integration-cli +++ b/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 )