Browse files

Bug 798041 - Fix Marionette mozharness script

  • Loading branch information...
1 parent 24116ee commit 4f26fc56c15ee34d6dbfe7ed887c5ee99575bbc0 @jonallengriffin jonallengriffin committed Oct 4, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 scripts/marionette.py
View
4 scripts/marionette.py
@@ -82,7 +82,7 @@ class MarionetteTest(TestingMixin, BaseScript):
}]] + copy.deepcopy(testing_config_options)
error_list = [
- {'substr': r'''FAILED (errors=''', 'level': ERROR},
+ {'substr': 'FAILED (errors=', 'level': ERROR},
]
mozbase_dir = os.path.join('tests', 'mozbase')
@@ -142,7 +142,7 @@ def query_abs_dirs(self):
dirs['abs_test_install_dir'], 'marionette', 'tests', 'testing',
'marionette', 'client', 'marionette', 'tests')
dirs['abs_gecko_dir'] = os.path.join(
- dirs['abs_work_dir'], 'gecko')
+ abs_dirs['abs_work_dir'], 'gecko')
for key in dirs.keys():
if key not in abs_dirs:
abs_dirs[key] = dirs[key]

0 comments on commit 4f26fc5

Please sign in to comment.