From 1706c755f49857556ba5f7e26847254e662a3dc0 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 5 Mar 2014 15:16:30 -0500 Subject: [PATCH] Backed out changeset 7f8961ec163f (bug 969146) for B2G mochitest shutdown crashes. --- testing/mozbase/mozrunner/mozrunner/remote.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/testing/mozbase/mozrunner/mozrunner/remote.py b/testing/mozbase/mozrunner/mozrunner/remote.py index 781b80aa8292..cf7bc9fa6f71 100644 --- a/testing/mozbase/mozrunner/mozrunner/remote.py +++ b/testing/mozbase/mozrunner/mozrunner/remote.py @@ -111,7 +111,6 @@ 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', @@ -156,8 +155,7 @@ class B2GRunner(RemoteRunner): self.kp_kwargs.update({'stream': sys.stdout, 'processOutputLine': self.on_output, - 'onTimeout': self.on_timeout, - 'onFinish': self.on_finish}) + 'onTimeout': self.on_timeout,}) self.process_handler = self.process_class(self.command, **self.kp_kwargs) self.process_handler.run(timeout=timeout, outputTimeout=outputTimeout) @@ -223,9 +221,6 @@ 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()