Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1059248 - Accept a test name when checking for crashes in DeviceRunner. r=ahalberstadt

Browse Source
This commit is contained in:
Dave Hunt 2014-08-27 09:49:00 -04:00
parent fac6627dd8
commit 544e98acfb
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/marionette/client/marionette/geckoinstance.py
View File

@ -93,9 +93,6 @@ class GeckoInstance(object):
'logfile': self.gecko_log})
self.runner.start()
def check_for_crashes(self):
return self.runner.check_for_crashes()
def close(self):
if self.runner:
self.runner.stop()

5
testing/marionette/client/marionette/marionette.py
View File

@ -725,12 +725,13 @@ class Marionette(object):
name = None
crashed = False
if self.runner:
if self.runner.check_for_crashes():
if self.runner.check_for_crashes(test_name=self.test_name):
returncode = self.emulator.proc.returncode
name = 'emulator'
crashed = True
elif self.instance:
if self.instance.check_for_crashes():
if self.instance.runner.check_for_crashes(
test_name=self.test_name):
crashed = True
if returncode is not None:
print ('PROCESS-CRASH | %s | abnormal termination with exit code %d' %

7
testing/mozbase/mozrunner/mozrunner/base/device.py
View File

@ -125,10 +125,11 @@ class DeviceRunner(BaseRunner):
def on_finish(self):
self.check_for_crashes()
def check_for_crashes(self):
def check_for_crashes(self, test_name=None):
test_name = test_name or self.last_test
dump_dir = self.device.pull_minidumps()
crashed = BaseRunner.check_for_crashes(self, dump_directory=dump_dir,
test_name=self.last_test)
crashed = BaseRunner.check_for_crashes(
self, dump_directory=dump_dir, test_name=test_name)
mozfile.remove(dump_dir)
return crashed