From 8d1307764fc7308fe66f4545e2fb7a7aca39d0c5 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Tue, 10 Nov 2015 13:17:37 +0000 Subject: [PATCH] Update to deal with weave/499d6312b7e6159ab94c116127b9c020fe109118 --- integration/310_container_to_container_edge_test.sh | 2 +- integration/320_container_edge_cross_host_2_test.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration/310_container_to_container_edge_test.sh b/integration/310_container_to_container_edge_test.sh index dadca51cc..1ff072a74 100755 --- a/integration/310_container_to_container_edge_test.sh +++ b/integration/310_container_to_container_edge_test.sh @@ -4,7 +4,7 @@ start_suite "Test short lived connections between containers" -WEAVE_NO_FASTDP=true weave_on $HOST1 launch +WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch scope_on $HOST1 launch weave_on $HOST1 run -d --name nginx nginx weave_on $HOST1 run -d --name client alpine /bin/sh -c "while true; do \ diff --git a/integration/320_container_edge_cross_host_2_test.sh b/integration/320_container_edge_cross_host_2_test.sh index 4e9a7ea51..b424d21e5 100755 --- a/integration/320_container_edge_cross_host_2_test.sh +++ b/integration/320_container_edge_cross_host_2_test.sh @@ -4,8 +4,8 @@ start_suite "Test short lived connections between containers on different hosts" -WEAVE_NO_FASTDP=true weave_on $HOST1 launch $HOST1 $HOST2 -WEAVE_NO_FASTDP=true weave_on $HOST2 launch $HOST1 $HOST2 +WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST1 launch $HOST1 $HOST2 +WEAVE_NO_FASTDP=true WEAVE_DOCKER_ARGS=$ADD_HOST_ARGS weave_on $HOST2 launch $HOST1 $HOST2 scope_on $HOST1 launch scope_on $HOST2 launch