From 529f7131d6ed74ad5d131563c9112ddf55f8d670 Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Wed, 5 Mar 2014 09:08:54 -0500 Subject: [PATCH] Bug 969146 - Pass MOZ_CRASHREPORTER_SHUTDOWN into b2g process, r=mdas --- testing/mozbase/mozrunner/mozrunner/remote.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testing/mozbase/mozrunner/mozrunner/remote.py b/testing/mozbase/mozrunner/mozrunner/remote.py index cf7bc9fa6f71..781b80aa8292 100644 --- a/testing/mozbase/mozrunner/mozrunner/remote.py +++ b/testing/mozbase/mozrunner/mozrunner/remote.py @@ -111,6 +111,7 @@ class B2GRunner(RemoteRunner): tmp_env = self.env or {} self.env = { 'MOZ_CRASHREPORTER': '1', 'MOZ_CRASHREPORTER_NO_REPORT': '1', + 'MOZ_CRASHREPORTER_SHUTDOWN': '1', 'MOZ_HIDE_RESULTS_TABLE': '1', 'MOZ_PROCESS_LOG': processLog, 'NSPR_LOG_MODULES': 'signaling:5,mtransport:3', @@ -155,7 +156,8 @@ class B2GRunner(RemoteRunner): self.kp_kwargs.update({'stream': sys.stdout, 'processOutputLine': self.on_output, - 'onTimeout': self.on_timeout,}) + 'onTimeout': self.on_timeout, + 'onFinish': self.on_finish}) self.process_handler = self.process_class(self.command, **self.kp_kwargs) self.process_handler.run(timeout=timeout, outputTimeout=outputTimeout) @@ -221,6 +223,9 @@ class B2GRunner(RemoteRunner): self.log.testFail(msg % (self.last_test, timeout)) self.check_for_crashes() + def on_finish(self): + self.check_for_crashes() + def _reboot_device(self): serial, status = self._get_device_status()