From 06eaac8690e5374cb724179003b924cbb6562f4b Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Tue, 3 Nov 2015 15:38:14 +0000 Subject: [PATCH] Don't assert ethwe carrier via the proxy The test script runs commands inside containers via docker exec to ensure the ethwe carrier is up. We must not run these commands via the proxy because it will interpose weavewait, which will block forever if attachment has failed (e.g. due to #1556). --- test/640_proxy_restart_reattaches_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/640_proxy_restart_reattaches_test.sh b/test/640_proxy_restart_reattaches_test.sh index c3e163fd..59bc91f8 100755 --- a/test/640_proxy_restart_reattaches_test.sh +++ b/test/640_proxy_restart_reattaches_test.sh @@ -7,7 +7,7 @@ C2=10.2.0.34 NAME=seetwo.weave.local check_attached() { - assert_raises "proxy exec_on $HOST1 c2 $CHECK_ETHWE_UP" + assert_raises "exec_on $HOST1 c2 $CHECK_ETHWE_UP" assert_dns_record $HOST1 c1 $NAME $C2 } @@ -51,6 +51,6 @@ check_attached proxy_start_container $HOST1 -di --name=c3 --restart=always # Use ipam, so it won't be attachable w/o weave weave_on $HOST1 stop weave_on $HOST1 launch-proxy -assert_raises "proxy exec_on $HOST1 c3 $CHECK_ETHWE_UP" +assert_raises "exec_on $HOST1 c3 $CHECK_ETHWE_UP" end_suite