summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-08-28 17:19:12 -0400
committerKali Kaneko <kali@leap.se>2017-08-30 16:18:50 -0400
commitb9fff80022e15560151f523015cb5bf73bd3cff1 (patch)
treee9c770266003d47b77244f8588c6c2ccf8dc8390 /tests
parent04bce963c2314dc9b21bd86224e75c22aae39d70 (diff)
[tests] do not fail if helper installed in debian path
Diffstat (limited to 'tests')
-rwxr-xr-xtests/e2e/e2e-test-vpn.sh3
-rw-r--r--tests/functional/features/steps/bitmask.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/e2e/e2e-test-vpn.sh b/tests/e2e/e2e-test-vpn.sh
index 750fef8..593c118 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 7e1201f..f79cd41 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)