From 05234232a31054a1b3b5d2cb4a8b6c89e772d37f Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Sat, 18 Jul 2015 20:59:02 -0700 Subject: [PATCH 1/5] switch tests to overlay Signed-off-by: Victor Vieux --- test/integration/helpers.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash index b2ceffa6d1..e17185343e 100644 --- a/test/integration/helpers.bash +++ b/test/integration/helpers.bash @@ -24,7 +24,7 @@ SWARM_BASE_PORT=$(( ( RANDOM % 1000 ) + 6000 )) BASE_PORT=$(( ( RANDOM % 1000 ) + 5000 )) # Drivers to use for Docker engines the tests are going to create. -STORAGE_DRIVER=${STORAGE_DRIVER:-aufs} +STORAGE_DRIVER=${STORAGE_DRIVER:-overlay} EXEC_DRIVER=${EXEC_DRIVER:-native} BUSYBOX_IMAGE="$BATS_TMPDIR/busybox.tgz" From fe4163148f417d2f60b13fef05c211eb23754cd8 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Sat, 18 Jul 2015 21:47:41 -0700 Subject: [PATCH 2/5] fix docker wait test Signed-off-by: Victor Vieux --- test/integration/api/wait.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/api/wait.bats b/test/integration/api/wait.bats index 86df0ddc26..8a89ada564 100644 --- a/test/integration/api/wait.bats +++ b/test/integration/api/wait.bats @@ -15,7 +15,7 @@ function teardown() { docker_swarm run -d --name test_container busybox sleep 1 # wait until exist(after 1 seconds) - run timeout 5 docker -H $SWARM_HOST wait test_container + run timeout 5 docker -H ${SWARM_HOSTS[0]} wait test_container [ "$status" -eq 0 ] [[ "${output}" == "0" ]] } From bcc28f658df8ad3f963e25c3a0548fea7639052f Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Sat, 18 Jul 2015 21:48:05 -0700 Subject: [PATCH 3/5] disable docker attach websocket test Signed-off-by: Victor Vieux --- test/integration/api/attach.bats | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/api/attach.bats b/test/integration/api/attach.bats index 71b62469ce..92cecced8c 100644 --- a/test/integration/api/attach.bats +++ b/test/integration/api/attach.bats @@ -25,6 +25,7 @@ function teardown() { } @test "docker attach through websocket" { +skip CLIENT_API_VERSION="v1.17" start_docker_with_busybox 2 swarm_manage From 5a217d6169f3e44a916012b7165b9a7c397a115d Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Sat, 18 Jul 2015 22:04:56 -0700 Subject: [PATCH 4/5] add new endpoints for docker cp Signed-off-by: Victor Vieux --- api/primary.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/api/primary.go b/api/primary.go index a3df99c78b..05a4fcb043 100644 --- a/api/primary.go +++ b/api/primary.go @@ -21,6 +21,9 @@ type context struct { type handler func(c *context, w http.ResponseWriter, r *http.Request) var routes = map[string]map[string]handler{ + "HEAD": { + "/containers/{name:.*}/archive": proxyContainer, + }, "GET": { "/_ping": ping, "/events": getEvents, @@ -35,6 +38,7 @@ var routes = map[string]map[string]handler{ "/images/{name:.*}/json": proxyImage, "/containers/ps": getContainersJSON, "/containers/json": getContainersJSON, + "/containers/{name:.*}/archive": proxyContainer, "/containers/{name:.*}/export": proxyContainer, "/containers/{name:.*}/changes": proxyContainer, "/containers/{name:.*}/json": getContainerJSON, @@ -68,6 +72,9 @@ var routes = map[string]map[string]handler{ "/exec/{execid:.*}/start": proxyHijack, "/exec/{execid:.*}/resize": proxyContainer, }, + "PUT": { + "/containers/{name:.*}/archive": proxyContainer, + }, "DELETE": { "/containers/{name:.*}": deleteContainers, "/images/{name:.*}": deleteImages, From b8f50bbf1f0708edb817ec9a216cbccf82d7c01f Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 30 Jul 2015 14:09:18 -0700 Subject: [PATCH 5/5] disable mesos tests again Signed-off-by: Victor Vieux --- test/integration/test_runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/test_runner.sh b/test/integration/test_runner.sh index faedb97a89..65a2c7b316 100755 --- a/test/integration/test_runner.sh +++ b/test/integration/test_runner.sh @@ -12,7 +12,7 @@ function execute() { } # Tests to run. Defaults to all. -TESTS=${@:-. discovery api mesos/api} +TESTS=${@:-. discovery api} # Generate a temporary binary for the tests. export SWARM_BINARY=`mktemp`