From d79f1eb9f34ca1d34b34ccd5e9b9904e8b9602c1 Mon Sep 17 00:00:00 2001
From: Nathan LeClaire <nathan.leclaire@gmail.com>
Date: Thu, 6 Aug 2015 00:42:56 -0700
Subject: [PATCH] Add some fixups to the integration tests

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
---
 test/integration/core/core-commands.bats | 2 +-
 test/integration/core/swarm-options.bats | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/integration/core/core-commands.bats b/test/integration/core/core-commands.bats
index b79481685b..027be89aea 100644
--- a/test/integration/core/core-commands.bats
+++ b/test/integration/core/core-commands.bats
@@ -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" {
diff --git a/test/integration/core/swarm-options.bats b/test/integration/core/swarm-options.bats
index bae395a09b..a87f7f3c4c 100644
--- a/test/integration/core/swarm-options.bats
+++ b/test/integration/core/swarm-options.bats
@@ -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" ]]
 }