From 882bff292ebb2321e6fc6a9e21c47c45372c2fb1 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 6 Dec 2016 11:48:27 +0000
Subject: [PATCH] Fix test invocation of weave again

Previous fix in b4a43f1b85a35d14b7b43f12c865f85347f55666 did not work
when built with code coverage.

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

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