From b4a43f1b85a35d14b7b43f12c865f85347f55666 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 22 Nov 2016 19:17:31 +0000
Subject: [PATCH] Fix test running with -v flag

Running a test script with -v causes `weave_on` and `docker_on` to
output progress messages, so we don't want to use those commands
inside `$()`
---
 test/830_cni_plugin_test.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/830_cni_plugin_test.sh b/test/830_cni_plugin_test.sh
index 89c67648..d64a2d47 100755
--- a/test/830_cni_plugin_test.sh
+++ b/test/830_cni_plugin_test.sh
@@ -65,8 +65,8 @@ assert_raises "exec_on $HOST1 c1 $PING $C3IP"
 stop_weave_on $HOST1
 
 # Ensure no warning is printed to the standard error:
-ACTUAL_OUTPUT=$(weave_on $HOST1 launch-router 2>&1)
-EXPECTED_OUTPUT=$(docker_on $HOST1 inspect --format="{{.Id}}" weave)
+ACTUAL_OUTPUT=$($SSH $HOST1 CHECKPOINT_DISABLE="$CHECKPOINT_DISABLE" weave launch-router 2>&1)
+EXPECTED_OUTPUT=$($SSH $HOST1 docker inspect --format="{{.Id}}" weave)
 
 assert_raises "[ $EXPECTED_OUTPUT == $ACTUAL_OUTPUT ]"