diff options
| author | Kali Kaneko <kali@leap.se> | 2017-08-17 17:14:23 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-08-17 17:16:21 -0400 |
| commit | 3b999adfc1f98c13833038bd9b2e2893c491958f (patch) | |
| tree | 04eff2fb0ec850453451e775a7ab15be31c6e481 | |
| parent | 29250b7f94872035caaf8d6e1ac39983d09840e6 (diff) | |
add bundle_path for environment case
| -rw-r--r-- | tests/functional/features/environment.py | 2 | ||||
| -rw-r--r-- | tests/functional/features/steps/bitmask.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/functional/features/environment.py b/tests/functional/features/environment.py index 8430d78e..5b179cd5 100644 --- a/tests/functional/features/environment.py +++ b/tests/functional/features/environment.py @@ -55,6 +55,8 @@ def before_all(context): elif MODE == BUNDLE_CI: # TODO set path to artifact XXX --- context.bundle_path = None + else: + context.bundle_path = None def _setup_webdriver(context): diff --git a/tests/functional/features/steps/bitmask.py b/tests/functional/features/steps/bitmask.py index fbba75ba..7e1201f6 100644 --- a/tests/functional/features/steps/bitmask.py +++ b/tests/functional/features/steps/bitmask.py @@ -9,13 +9,13 @@ from behave import given @given('I start bitmask for the first time') def initial_run(context): - if context.MODE == 'virtualenv': + 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 == 'bundle': + elif context.mode in ('bundle', 'bundle-ci'): commands.getoutput(context.bundle_path) time.sleep(2) tokenpath = os.path.join(get_path_prefix(), 'leap', 'authtoken') |