Merge pull request #1394 from abronan/fix_integration

Fix integration tests, --exec-driver has been removed in docker master

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

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 "$@")
 

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.