docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1394 from abronan/fix_integration 

Fix integration tests, --exec-driver has been removed in docker master
This commit is contained in:
Alexandre Beslic 2015-11-10 09:36:16 -08:00
parent 9ddb3c474c 374370e39d
commit fe360978ac
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/helpers.bash
View File

@ -26,7 +26,6 @@ BASE_PORT=$(( ( RANDOM % 1000 ) + 5000 ))
# Drivers to use for Docker engines the tests are going to create. # Drivers to use for Docker engines the tests are going to create.
STORAGE_DRIVER=${STORAGE_DRIVER:-overlay} STORAGE_DRIVER=${STORAGE_DRIVER:-overlay}
EXEC_DRIVER=${EXEC_DRIVER:-native}
BUSYBOX_IMAGE="$BATS_TMPDIR/busybox.tgz" BUSYBOX_IMAGE="$BATS_TMPDIR/busybox.tgz"
@ -178,8 +177,8 @@ function start_docker() {
${DOCKER_IMAGE}:${DOCKER_VERSION} \ ${DOCKER_IMAGE}:${DOCKER_VERSION} \
bash -c "\ bash -c "\
hostname node-$i && \ hostname node-$i && \
docker -d -H 127.0.0.1:$port \ docker daemon -H 127.0.0.1:$port \
--storage-driver=$STORAGE_DRIVER --exec-driver=$EXEC_DRIVER \ --storage-driver=$STORAGE_DRIVER \
`join ' ' $@` \ `join ' ' $@` \
") ")
done done

1
test/integration/run.sh
View File

@ -23,7 +23,6 @@ ID=$(docker run -d -t --privileged \
-e "DOCKER_IMAGE=$DOCKER_IMAGE" \ -e "DOCKER_IMAGE=$DOCKER_IMAGE" \
-e "DOCKER_VERSION=$DOCKER_VERSION" \ -e "DOCKER_VERSION=$DOCKER_VERSION" \
-e "STORAGE_DRIVER=$STORAGE_DRIVER" \ -e "STORAGE_DRIVER=$STORAGE_DRIVER" \
-e "EXEC_DRIVER=$EXEC_DRIVER" \
${INTEGRATION_IMAGE} \ ${INTEGRATION_IMAGE} \
./test_runner.sh "$@") ./test_runner.sh "$@")

2
test/integration/test_runner.sh
View File

@ -26,7 +26,7 @@ execute time go build -o "$SWARM_BINARY" ../..
# Start the docker engine. # Start the docker engine.
execute docker --daemon --log-level=panic \ execute docker --daemon --log-level=panic \
--storage-driver="$STORAGE_DRIVER" --exec-driver="$EXEC_DRIVER" & --storage-driver="$STORAGE_DRIVER" &
DOCKER_PID=$! DOCKER_PID=$!
# Wait for it to become reachable. # Wait for it to become reachable.