wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1255064 - MarionetteHarness should internally use dicts for arguments; r=maja_zf a=test-only

Browse Source 
MozReview-Commit-ID: 94muKM44wVq
This commit is contained in:
Rachel 2016-03-18 19:33:08 -07:00
parent 36992d510c
commit 0170e73a8f
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/media/test/external/mach_commands.py vendored
View File

@ -50,7 +50,7 @@ def run_external_media_test(tests, testtype=None, topsrcdir=None, **kwargs):
args,
{"mach": sys.stdout})
failed = mn_cli(MediaTestRunner, MediaTestArguments, FirefoxMediaHarness,
args=args)
args=vars(args))
if failed > 0:
return 1

17
testing/marionette/harness/marionette/runtests.py
View File

@ -53,23 +53,24 @@ class MarionetteHarness(object):
args.logger_name, args, logger_defaults or {"tbpl": sys.stdout})
args.logger = logger
return args
return vars(args)
def process_args(self):
if self.args.pydebugger:
MarionetteTestCase.pydebugger = __import__(self.args.pydebugger)
if self.args.get('pydebugger'):
MarionetteTestCase.pydebugger = __import__(self.args['pydebugger'])
def run(self):
try:
self.process_args()
args_dict = vars(self.args)
tests = args_dict.pop('tests')
runner = self._runner_class(**args_dict)
tests = self.args.pop('tests')
runner = self._runner_class(**self.args)
runner.run_tests(tests)
return runner.failed
except Exception:
self.args.logger.error('Failure during test execution.',
exc_info=True)
logger = self.args.get('logger')
if logger:
logger.error('Failure during test execution.',
exc_info=True)
raise

2
testing/marionette/mach_commands.py
View File

@ -67,7 +67,7 @@ def run_marionette(tests, b2g_path=None, emulator=None, testtype=None,
args.logger = commandline.setup_logging("Marionette Unit Tests",
args,
{"mach": sys.stdout})
failed = MarionetteHarness(MarionetteTestRunner, args=args).run()
failed = MarionetteHarness(MarionetteTestRunner, args=vars(args)).run()
if failed > 0:
return 1
else: