From ddd4aa2bf20b88b68c2a0e6bdadaf648a5ee379b Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 14 Apr 2016 14:19:26 -0700 Subject: [PATCH] update compose, remove useless bash and improve test Signed-off-by: Victor Vieux --- test/integration/api/top.bats | 4 ++-- test/integration/helpers.bash | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/integration/api/top.bats b/test/integration/api/top.bats index ea0054e974..2d0da80d7a 100644 --- a/test/integration/api/top.bats +++ b/test/integration/api/top.bats @@ -18,7 +18,7 @@ function teardown() { run docker_swarm top test_container [ "$status" -eq 0 ] - [[ "${lines[0]}" == *"UID"* ]] - [[ "${lines[0]}" == *"CMD"* ]] + [[ "${lines[0]}" == *"UID"* ]] || [[ "${lines[0]}" == *"PID"* ]] + [[ "${lines[0]}" == *"CMD"* ]] || [[ "${lines[0]}" == *"COMMAND"* ]] [[ "${lines[1]}" == *"sleep 500"* ]] } diff --git a/test/integration/helpers.bash b/test/integration/helpers.bash index 75378fd99f..af9db621a9 100644 --- a/test/integration/helpers.bash +++ b/test/integration/helpers.bash @@ -16,7 +16,7 @@ SWARM_BINARY=${SWARM_BINARY:-${SWARM_ROOT}/swarm} DOCKER_IMAGE=${DOCKER_IMAGE:-dockerswarm/dind-master} DOCKER_VERSION=${DOCKER_VERSION:-latest} DOCKER_BINARY=${DOCKER_BINARY:-`command -v docker`} -DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION:-1.6.2} +DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION:-1.7.0} # Port on which the manager will listen to (random port between 6000 and 7000). SWARM_BASE_PORT=$(( ( RANDOM % 1000 ) + 6000 )) @@ -205,7 +205,7 @@ function start_docker() { # -v /usr/local/bin -v /var/run are specific to mesos, so the slave can do a --volumes-from and use the docker cli docker_host run -d --name node-$i --privileged -v /usr/local/bin -v /var/run -it --net=host \ ${DOCKER_IMAGE}:${DOCKER_VERSION} \ - bash -c "\ + sh -c "\ rm /var/run/docker.pid ; \ rm /var/run/docker/libcontainerd/docker-containerd.pid ; \ rm /var/run/docker/libcontainerd/docker-containerd.sock ; \