diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/e2e/check_ip | 9 | ||||
| -rwxr-xr-x | tests/e2e/e2e-test-vpn.sh | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/tests/e2e/check_ip b/tests/e2e/check_ip index 8a45f2c..662ab2f 100755 --- a/tests/e2e/check_ip +++ b/tests/e2e/check_ip @@ -4,7 +4,7 @@ import urllib.request import json import sys -DEMO_ISPS = ('Riseup Networks', '') +DEMO_ISPS = ('Riseup Networks',) url = 'https://wtfismyip.com/json' @@ -26,9 +26,9 @@ try: cmd = sys.argv[1] if cmd == 'vpn_on': - assert isp == DEMO_ISP + assert isp in DEMO_ISPS elif cmd == 'vpn_off': - assert isp != DEMO_ISP + assert isp not in DEMO_ISPS else: raise BadCmd() @@ -36,8 +36,9 @@ except BadCmd: print("Cannot parse that command. Valid commands: vpn_on, vpn_off") sys.exit(1) -except Exception: +except Exception as exc: print("IP *NOT* as expected") + print("%r" % exc) sys.exit(1) else: diff --git a/tests/e2e/e2e-test-vpn.sh b/tests/e2e/e2e-test-vpn.sh index 05c1913..750fef8 100755 --- a/tests/e2e/e2e-test-vpn.sh +++ b/tests/e2e/e2e-test-vpn.sh @@ -35,9 +35,6 @@ pw="$(head -c 10 < /dev/urandom | base64)" [ -d "$LEAP_HOME" ] && rm -rf "$LEAP_HOME" -"$BCTL" start - - # Register a new user # Disable xtrace set +x @@ -53,11 +50,12 @@ set +x # Start VPN, wait a bit "$BCTL" vpn start --json -sleep 3 +sleep 5 "$BCTL" vpn status --json # XXX gateway does not get added to resolv.conf -echo "nameserver 10.42.0.1" > /etc/resolv.conf +# If we are running as root, as in the CI, we can do this directly +# echo "nameserver 10.42.0.1" > /etc/resolv.conf # cat /etc/resolv.conf sleep 5 @@ -67,10 +65,10 @@ sleep 5 tests/e2e/check_ip vpn_on "$BCTL" vpn stop -sleep 3 +sleep 5 # XXX debug do this only if no other entry in resolv.conf -echo "nameserver 77.109.148.136" > /etc/resolv.conf +# echo "nameserver 77.109.148.136" > /etc/resolv.conf # TEST that we're NOT going through the provider's VPN |