From 374370e39d3eb468bfe72f98e577d57c7a8b7d47 Mon Sep 17 00:00:00 2001 From: Alexandre Beslic Date: Mon, 9 Nov 2015 09:34:37 -0800 Subject: [PATCH] fix integration tests, --exec-driver has been removed in docker master Signed-off-by: Alexandre Beslic --- test/integration/helpers.bash | 5 ++--- test/integration/run.sh | 1 - test/integration/test_runner.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash index 6d048ff57b..4380945087 100644 --- a/test/integration/helpers.bash +++ b/test/integration/helpers.bash @@ -26,7 +26,6 @@ BASE_PORT=$(( ( RANDOM % 1000 ) + 5000 )) # Drivers to use for Docker engines the tests are going to create. STORAGE_DRIVER=${STORAGE_DRIVER:-overlay} -EXEC_DRIVER=${EXEC_DRIVER:-native} BUSYBOX_IMAGE="$BATS_TMPDIR/busybox.tgz" @@ -178,8 +177,8 @@ function start_docker() { ${DOCKER_IMAGE}:${DOCKER_VERSION} \ bash -c "\ hostname node-$i && \ - docker -d -H 127.0.0.1:$port \ - --storage-driver=$STORAGE_DRIVER --exec-driver=$EXEC_DRIVER \ + docker daemon -H 127.0.0.1:$port \ + --storage-driver=$STORAGE_DRIVER \ `join ' ' $@` \ ") done diff --git a/test/integration/run.sh b/test/integration/run.sh index 39f9fd2ef5..5ccbd64399 100755 --- a/test/integration/run.sh +++ b/test/integration/run.sh @@ -23,7 +23,6 @@ ID=$(docker run -d -t --privileged \ -e "DOCKER_IMAGE=$DOCKER_IMAGE" \ -e "DOCKER_VERSION=$DOCKER_VERSION" \ -e "STORAGE_DRIVER=$STORAGE_DRIVER" \ - -e "EXEC_DRIVER=$EXEC_DRIVER" \ ${INTEGRATION_IMAGE} \ ./test_runner.sh "$@") diff --git a/test/integration/test_runner.sh b/test/integration/test_runner.sh index 713d952c1a..54c5d260a6 100755 --- a/test/integration/test_runner.sh +++ b/test/integration/test_runner.sh @@ -26,7 +26,7 @@ execute time go build -o "$SWARM_BINARY" ../.. # Start the docker engine. execute docker --daemon --log-level=panic \ - --storage-driver="$STORAGE_DRIVER" --exec-driver="$EXEC_DRIVER" & + --storage-driver="$STORAGE_DRIVER" & DOCKER_PID=$! # Wait for it to become reachable.