From 82d3d64b7e7da0d75bff2c249276c0ef441e0cbc Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Fri, 12 Jun 2015 17:30:27 -0700 Subject: [PATCH] update a test to use 2 slaves Signed-off-by: Victor Vieux --- test/integration/mesos/api.bats | 4 ++-- test/integration/mesos/mesos_helpers.bash | 25 +++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/test/integration/mesos/api.bats b/test/integration/mesos/api.bats index e2ce253e36..3b2f72deac 100644 --- a/test/integration/mesos/api.bats +++ b/test/integration/mesos/api.bats @@ -9,12 +9,12 @@ function teardown() { } @test "docker info" { - start_docker 1 + start_docker 2 start_mesos swarm_manage_mesos run docker_swarm info [ "$status" -eq 0 ] - [[ "${output}" == *'Offers'* ]] + [[ "${output}" == *'Offers: 2'* ]] } @test "docker run no resources" { diff --git a/test/integration/mesos/mesos_helpers.bash b/test/integration/mesos/mesos_helpers.bash index 7546caf2a5..989ac1fd69 100644 --- a/test/integration/mesos/mesos_helpers.bash +++ b/test/integration/mesos/mesos_helpers.bash @@ -7,33 +7,36 @@ MESOS_MASTER_PORT=$(( ( RANDOM % 1000 ) + 10000 )) # Start mesos master and slave. function start_mesos() { + local current=${#DOCKER_CONTAINERS[@]} MESOS_MASTER=$( docker_host run -d --name mesos-master --net=host \ $MESOS_IMAGE /mesos/build/bin/mesos-master.sh --ip=127.0.0.1 --work_dir=/ --registry=in_memory --port=$MESOS_MASTER_PORT ) retry 10 1 eval "docker_host ps | grep 'mesos-master'" - - MESOS_SLAVE=$( - docker_host run --privileged -d --name mesos-slave --volumes-from node-0 -e DOCKER_HOST="${HOSTS[0]}" -v /sys/fs/cgroup:/sys/fs/cgroup --net=host \ - $MESOS_IMAGE /mesos/build/bin/mesos-slave.sh --master=127.0.0.1:$MESOS_MASTER_PORT --containerizers=docker --attributes="docker_port:${PORTS[0]}" --hostname=127.0.0.1 --port=$(($MESOS_MASTER_PORT + 1)) - ) - retry 10 1 eval "docker_host ps | grep 'mesos-slave'" + for ((i=0; i < current; i++)); do + MESOS_SLAVES[$i]=$( + docker_host run --privileged -d --name mesos-slave-$i --volumes-from node-$i -e DOCKER_HOST="${HOSTS[$i]}" -v /sys/fs/cgroup:/sys/fs/cgroup --net=host \ + $MESOS_IMAGE /mesos/build/bin/mesos-slave.sh --master=127.0.0.1:$MESOS_MASTER_PORT --containerizers=docker --attributes="docker_port:${PORTS[$i]}" --hostname=127.0.0.1 --port=$(($MESOS_MASTER_PORT + (1 + $i))) + ) + retry 10 1 eval "docker_host ps | grep 'mesos-slave-$i'" + done } # Start the swarm manager in background. function swarm_manage_mesos() { + local current=${#DOCKER_CONTAINERS[@]} "$SWARM_BINARY" -l debug manage -H "$SWARM_HOST" --cluster-driver mesos-experimental --cluster-opt mesos.user=daemon 127.0.0.1:$MESOS_MASTER_PORT & SWARM_PID=$! - retry 10 1 eval "docker_swarm info | grep 'Offers: 1'" + retry 10 1 eval "docker_swarm info | grep 'Offers: $current'" } # Stop mesos master and slave. function stop_mesos() { - echo "Stopping $DOCKER_CONTAINER" - docker_host rm -f -v $DOCKER_CONTAINER > /dev/null; echo "Stopping $MESOS_MASTER" docker_host rm -f -v $MESOS_MASTER > /dev/null; - echo "Stopping $MESOS_SLAVE" - docker_host rm -f -v $MESOS_SLAVE > /dev/null; + for id in ${MESOS_SLAVES[@]}; do + echo "Stopping $id" + docker_host rm -f -v $id > /dev/null; + done }