reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update tests after removing canary refresh flag

Browse Source
This commit is contained in:
Simon Howe committed 2020-07-15 11:37:53 +02:00
1 parent 899490c3f9
commit c0e5008202
1 file changed
+5 -27
Download Patch File Download Diff File Expand all files Collapse all files
test/135_expose_iptables_refresh.sh
+5 -27
View File
@@ -19,24 +19,14 @@ get_weave_iptable_rules() {
} }
wait_for_iptable_refresh() { wait_for_iptable_refresh() {
sleep 2 # Canary is checked every 10s
sleep 12
} }
start_suite "exposing weave network to host" start_suite "exposing weave network to host"
# Launch # Launch
weave_on1 "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"
IPT_BEFORE=$(get_weave_iptable_rules) IPT_BEFORE=$(get_weave_iptable_rules)
run_on1 "sudo iptables -t nat -X WEAVE-CANARY" run_on1 "sudo iptables -t nat -X WEAVE-CANARY"
wait_for_iptable_refresh wait_for_iptable_refresh
@@ -44,20 +34,8 @@ IPT_AFTER=$(get_weave_iptable_rules)
assert_raises "diff <(echo $IPT_BEFORE) <(echo $IPT_AFTER)" 0 assert_raises "diff <(echo $IPT_BEFORE) <(echo $IPT_AFTER)" 0
stop_weave_on1 stop_weave_on1
# Expose # After exposing
weave_on1 "launch"
## 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"
weave_on1 "expose" weave_on1 "expose"
IPT_BEFORE=$(get_weave_iptable_rules) IPT_BEFORE=$(get_weave_iptable_rules)
run_on1 "sudo iptables -t nat -X WEAVE-CANARY" run_on1 "sudo iptables -t nat -X WEAVE-CANARY"