From f3b66428dbf5726dd5be507bc551a0264d2b6798 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Thu, 22 Oct 2015 15:18:38 +0000 Subject: [PATCH] Don't use fast datapath for our inter-container connection tests. --- integration/310_container_to_container_edge_test.sh | 4 ++-- integration/320_container_edge_cross_host_2_test.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration/310_container_to_container_edge_test.sh b/integration/310_container_to_container_edge_test.sh index ec19d8ca9..dadca51cc 100755 --- a/integration/310_container_to_container_edge_test.sh +++ b/integration/310_container_to_container_edge_test.sh @@ -4,11 +4,11 @@ start_suite "Test short lived connections between containers" -weave_on $HOST1 launch +WEAVE_NO_FASTDP=true 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 \ - wget http://nginx.weave.local:80/ >/dev/null || true; \ + wget http://nginx.weave.local:80/ -O - >/dev/null || true; \ sleep 1; \ done" diff --git a/integration/320_container_edge_cross_host_2_test.sh b/integration/320_container_edge_cross_host_2_test.sh index 60cf40720..4e9a7ea51 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_on $HOST1 launch $HOST1 $HOST2 -weave_on $HOST2 launch $HOST1 $HOST2 +WEAVE_NO_FASTDP=true weave_on $HOST1 launch $HOST1 $HOST2 +WEAVE_NO_FASTDP=true weave_on $HOST2 launch $HOST1 $HOST2 scope_on $HOST1 launch scope_on $HOST2 launch