Skip to content
Browse files

Bug 783696 - Make Marionette mozharness script use mozbase modules fr…

…om tests.zip, r=aki
  • Loading branch information...
1 parent cf4bfe9 commit 01a459e1448762a9c96cdd2633495ce1b08c6738 @jonallengriffin jonallengriffin committed
Showing with 8 additions and 7 deletions.
  1. +8 −7 scripts/marionette.py
View
15 scripts/marionette.py
@@ -71,14 +71,15 @@ class MarionetteTest(TestingMixin, BaseScript):
{'substr': r'''FAILED (errors=''', 'level': ERROR},
]
+ mozbase_dir = os.path.join('tests', 'mozbase')
virtualenv_modules = [
- 'datazilla',
- 'mozinstall',
- 'mozhttpd',
- 'manifestdestiny',
- 'mozprofile',
- 'mozprocess',
- 'mozrunner',
+ { 'manifestparser': os.path.join(mozbase_dir, 'manifestdestiny') },
+ { 'mozhttpd': os.path.join(mozbase_dir, 'mozhttpd') },
+ { 'mozinfo': os.path.join(mozbase_dir, 'mozinfo') },
+ { 'mozinstall': os.path.join(mozbase_dir, 'mozinstall') },
+ { 'mozprofile': os.path.join(mozbase_dir, 'mozprofile') },
+ { 'mozprocess': os.path.join(mozbase_dir, 'mozprocess') },
+ { 'mozrunner': os.path.join(mozbase_dir, 'mozrunner') },
]
def __init__(self, require_config_file=False):

0 comments on commit 01a459e

Please sign in to comment.
Something went wrong with that request. Please try again.