Add some fixups to the integration tests

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire 2015-08-06 00:42:56 -07:00
parent af08468f00
commit d79f1eb9f3
2 changed files with 3 additions and 3 deletions

View File

@ -41,7 +41,7 @@ load ${BASE_TEST_DIR}/helpers.bash
}
@test "$DRIVER: docker commands with the socket should work" {
run machine ssh $NAME -- docker version
run machine ssh $NAME -- sudo docker version
}
@test "$DRIVER: stop" {

View File

@ -4,7 +4,7 @@ load ${BASE_TEST_DIR}/helpers.bash
export TOKEN=$(curl -sS -X POST "https://discovery-stage.hub.docker.com/v1/clusters")
@test "create swarm master" {
run machine create -d $DRIVER --swarm --swarm-master --swarm-discovery "token://$TOKEN" --swarm-strategy binpack --swarm-opt heartbeat=5 queenbee
run machine create -d $DRIVER --swarm --swarm-master --swarm-discovery "token://$TOKEN" --swarm-strategy binpack --swarm-opt heartbeat=5s queenbee
echo ${output}
[[ "$status" -eq 0 ]]
}
@ -23,5 +23,5 @@ export TOKEN=$(curl -sS -X POST "https://discovery-stage.hub.docker.com/v1/clust
@test "ensure heartbeat" {
heartbeat_arg=$(docker $(machine config queenbee) inspect -f '{{index .Args 9}}' swarm-agent-master)
echo ${heartbeat_arg}
[[ "$heartbeat_arg" == "--heartbeat=5" ]]
[[ "$heartbeat_arg" == "--heartbeat=5s" ]]
}