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

Fixes 2537: status now prints 'failed to check latest version' when the checkpoint API is not available (+test).

Browse Source
This commit is contained in:
Marc CARRE committed 2016-11-09 17:46:52 +00:00
1 parent 9414e2979d
commit b03b3fccc7
3 files changed
+48 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/700_status_and_report_test.sh
+39
View File
@@ -3,9 +3,13 @@
. ./config.sh
UNIVERSE=10.2.0.0/16
IPTABLES_BACKUP=/tmp/700_status_and_report_test.iptables
CHECKPOINT_URL=https://checkpoint-api.weave.works/v1/check/weave-net
start_suite "weave status/report"
weave_on $HOST1 launch --ipalloc-range $UNIVERSE --name 8a:3e:3e:3e:3e:3e --nickname nicknamington
check() {
@@ -29,10 +33,43 @@ assert "weave_on $HOST1 status connections | tr -s ' ' | cut -d ' ' -f 2" "10.2.
assert "weave_on $HOST1 report -f '{{.VersionCheck.Enabled}}'" "false"
assert_raises "weave_on $HOST1 status | grep 'version check update disabled'"
# Block outgoing traffic to Weave's checkpoint API, to prevent retrieval of latest version:
run_on $HOST1 "sudo iptables-save > $IPTABLES_BACKUP"
[ -z "$DEBUG" ] || greyly echo "Backed iptables rules up:"
[ -z "$DEBUG" ] || run_on $HOST1 cat $IPTABLES_BACKUP
[ -z "$DEBUG" ] || greyly echo "Updating iptables rules."
run_on $HOST1 sudo iptables -A OUTPUT -p tcp -d checkpoint-api.weave.works --dport 443 -j REJECT --reject-with tcp-reset
[ -z "$DEBUG" ] || greyly echo "Updated iptables rules:"
[ -z "$DEBUG" ] || run_on $HOST1 sudo iptables -L
[ -z "$DEBUG" ] || greyly echo "Test access to checkpoint:"
[ -z "$DEBUG" ] || run_on $HOST1 "curl -X GET $CHECKPOINT_URL || true"
weave_on $HOST1 reset
CHECKPOINT_DISABLE="" weave_on $HOST1 launch
assert "weave_on $HOST1 report -f '{{.VersionCheck.Enabled}}'" "true"
assert "weave_on $HOST1 report -f '{{.VersionCheck.Success}}'" "false"
assert "weave_on $HOST1 report -f '{{.VersionCheck.NewVersion}}'" ""
assert_raises "weave_on $HOST1 status | grep 'failed to check latest version - see logs; next check at'"
[ -z "$DEBUG" ] || greyly echo "Reverting iptables rules."
run_on $HOST1 "sudo iptables-restore < $IPTABLES_BACKUP"
[ -z "$DEBUG" ] || greyly echo "Reverted iptables rules:"
[ -z "$DEBUG" ] || run_on $HOST1 sudo iptables -L
[ -z "$DEBUG" ] || greyly echo "Test access to checkpoint:"
[ -z "$DEBUG" ] || run_on $HOST1 curl -X GET $CHECKPOINT_URL
weave_on $HOST1 reset
CHECKPOINT_DISABLE="" weave_on $HOST1 launch
assert "weave_on $HOST1 report -f '{{.VersionCheck.Enabled}}'" "true"
assert "weave_on $HOST1 report -f '{{.VersionCheck.Success}}'" "true"
NEW_VSN=$(weave_on $HOST1 report -f "{{.VersionCheck.NewVersion}}")
if [ -z "$NEW_VSN" ]; then
@@ -41,4 +78,6 @@ else
assert_raises "weave_on $HOST1 status | grep \"version $NEW_VSN available - please upgrade!\""
fi
end_suite