From 6cb13e80a5e0ea1ab614d51e7ed831d6ec251306 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Wed, 16 Aug 2017 11:28:21 -0400 Subject: [tests] prepare to run behave against bundle --- tests/functional/features/steps/bitmask.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'tests/functional/features/steps/bitmask.py') diff --git a/tests/functional/features/steps/bitmask.py b/tests/functional/features/steps/bitmask.py index d9f90578..7e1201f6 100644 --- a/tests/functional/features/steps/bitmask.py +++ b/tests/functional/features/steps/bitmask.py @@ -9,11 +9,15 @@ from behave import given @given('I start bitmask for the first time') def initial_run(context): - commands.getoutput('bitmaskctl stop') - # TODO: fix bitmaskctl to only exit once bitmaskd has stopped - time.sleep(2) - _initialize_home_path() - commands.getoutput('bitmaskctl start') + if context.mode == 'virtualenv': + commands.getoutput('bitmaskctl stop') + # TODO: fix bitmaskctl to only exit once bitmaskd has stopped + time.sleep(2) + _initialize_home_path() + commands.getoutput('bitmaskctl start') + elif context.mode in ('bundle', 'bundle-ci'): + commands.getoutput(context.bundle_path) + time.sleep(2) tokenpath = os.path.join(get_path_prefix(), 'leap', 'authtoken') token = open(tokenpath).read().strip() context.login_url = "http://localhost:7070/#%s" % token -- cgit v1.2.3