diff options
| author | Kali Kaneko <kali@leap.se> | 2017-08-28 17:19:12 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-08-30 16:18:50 -0400 |
| commit | b9fff80022e15560151f523015cb5bf73bd3cff1 (patch) | |
| tree | e9c770266003d47b77244f8588c6c2ccf8dc8390 /tests | |
| parent | 04bce963c2314dc9b21bd86224e75c22aae39d70 (diff) | |
[tests] do not fail if helper installed in debian path
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/e2e/e2e-test-vpn.sh | 3 | ||||
| -rw-r--r-- | tests/functional/features/steps/bitmask.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/e2e/e2e-test-vpn.sh b/tests/e2e/e2e-test-vpn.sh index 750fef8e..593c1185 100755 --- a/tests/e2e/e2e-test-vpn.sh +++ b/tests/e2e/e2e-test-vpn.sh @@ -59,7 +59,8 @@ sleep 5 # cat /etc/resolv.conf sleep 5 -#ip link show +ip link show +cat ~/.config/leap/bitmaskd.log # TEST that we're going through the provider's VPN tests/e2e/check_ip vpn_on diff --git a/tests/functional/features/steps/bitmask.py b/tests/functional/features/steps/bitmask.py index 7e1201f6..f79cd41c 100644 --- a/tests/functional/features/steps/bitmask.py +++ b/tests/functional/features/steps/bitmask.py @@ -10,11 +10,14 @@ from behave import given @given('I start bitmask for the first time') def initial_run(context): if context.mode == 'virtualenv': + cmd = commands.getoutput('which bitmaskctl') + # print("CMD PATH", cmd) commands.getoutput('bitmaskctl stop') # TODO: fix bitmaskctl to only exit once bitmaskd has stopped time.sleep(2) _initialize_home_path() commands.getoutput('bitmaskctl start') + time.sleep(1) elif context.mode in ('bundle', 'bundle-ci'): commands.getoutput(context.bundle_path) time.sleep(2) |