diff --git a/test/135_expose_iptables_refresh.sh b/test/135_expose_iptables_refresh.sh index f354bbac..a844e7cc 100755 --- a/test/135_expose_iptables_refresh.sh +++ b/test/135_expose_iptables_refresh.sh @@ -19,24 +19,14 @@ get_weave_iptable_rules() { } wait_for_iptable_refresh() { - sleep 2 + # Canary is checked every 10s + sleep 12 } start_suite "exposing weave network to host" # Launch - -## Check no refreshing -weave_on1 "launch --iptables-refresh-interval=0s" -IPT_BEFORE=$(get_weave_iptable_rules) -run_on1 "sudo iptables -t nat -X WEAVE-CANARY" -wait_for_iptable_refresh -IPT_AFTER=$(get_weave_iptable_rules) -assert_raises "diff <(echo $IPT_BEFORE) <(echo $IPT_AFTER)" 1 -stop_weave_on1 - -## Check refreshing -weave_on1 "launch --iptables-refresh-interval=1s" +weave_on1 "launch" IPT_BEFORE=$(get_weave_iptable_rules) run_on1 "sudo iptables -t nat -X WEAVE-CANARY" wait_for_iptable_refresh @@ -44,20 +34,8 @@ IPT_AFTER=$(get_weave_iptable_rules) assert_raises "diff <(echo $IPT_BEFORE) <(echo $IPT_AFTER)" 0 stop_weave_on1 -# Expose - -## Check no refreshing -weave_on1 "launch --iptables-refresh-interval=0s" -weave_on1 "expose" -IPT_BEFORE=$(get_weave_iptable_rules) -run_on1 "sudo iptables -t nat -X WEAVE-CANARY" -wait_for_iptable_refresh -IPT_AFTER=$(get_weave_iptable_rules) -assert_raises "diff <(echo $IPT_BEFORE) <(echo $IPT_AFTER)" 1 -stop_weave_on1 - -## Check refreshing -weave_on1 "launch --iptables-refresh-interval=1s" +# After exposing +weave_on1 "launch" weave_on1 "expose" IPT_BEFORE=$(get_weave_iptable_rules) run_on1 "sudo iptables -t nat -X WEAVE-CANARY"