Bug 967647 - fix interleaved output in b2g emulator unittests, r=jgriffin
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 04 Feb 2014 15:39:35 -0500
changeset 166818 dbeb31399750e6e46599e89c76cfcef5f8a7553c
parent 166817 145a831ad90ae29dc196fac657d9246406971e32
child 166819 4ab773616cadd09ac98212da24d3f3ba015b0857
push id39293
push userahalberstadt@mozilla.com
push dateTue, 04 Feb 2014 20:40:10 +0000
treeherdermozilla-inbound@dbeb31399750 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs967647
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 967647 - fix interleaved output in b2g emulator unittests, r=jgriffin
testing/mozbase/mozrunner/mozrunner/remote.py
--- a/testing/mozbase/mozrunner/mozrunner/remote.py
+++ b/testing/mozbase/mozrunner/mozrunner/remote.py
@@ -185,26 +185,27 @@ class B2GRunner(RemoteRunner):
 
     def on_output(self, line):
         print line
         match = re.findall(r"TEST-START \| ([^\s]*)", line)
         if match:
             self.last_test = match[-1]
 
     def on_timeout(self):
+        self.dm.killProcess('/system/b2g/b2g', sig=signal.SIGABRT)
+
         msg = "%s | application timed out after %s seconds"
 
         if self.timeout:
             timeout = self.timeout
         else:
             timeout = self.outputTimeout
             msg = "%s with no output" % msg
 
         self.log.testFail(msg % (self.last_test, timeout))
-        self.dm.killProcess('/system/b2g/b2g', sig=signal.SIGABRT)
         self.check_for_crashes()
 
     def _reboot_device(self):
         serial, status = self._get_device_status()
         self.dm.shellCheckOutput(['/system/bin/reboot'])
 
         # The reboot command can return while adb still thinks the device is
         # connected, so wait a little bit for it to disconnect from adb.