Bug 781608 - Don't call waitForFinish with a short timeout, in case old mozprocess is still in use, a=test-only, DONTBUILD because NPOTB
authorJonathan Griffin <jgriffin@mozilla.com>
Thu, 09 Aug 2012 12:04:28 -0700
changeset 101940 ed5c848f50e0d48341e4f7ee5ffbff74f650e587
parent 101939 4770bca010461123a3bfde393bdebd1884dc3fcf
child 101977 9efc7b150f4178452d9f159bcbe2b0cda1979362
child 101995 5784d6ac4c5e28e8aab48d4107174eab157cb51c
child 102174 164ba0314872a98d8ed6ec506833968ef29ee1c8
push id23257
push userjgriffin@mozilla.com
push dateThu, 09 Aug 2012 19:04:55 +0000
treeherdermozilla-central@ed5c848f50e0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only, DONTBUILD
bugs781608
milestone17.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 781608 - Don't call waitForFinish with a short timeout, in case old mozprocess is still in use, a=test-only, DONTBUILD because NPOTB
build/mobile/b2gautomation.py
--- a/build/mobile/b2gautomation.py
+++ b/build/mobile/b2gautomation.py
@@ -224,17 +224,20 @@ class B2GRemoteAutomation(Automation):
 
         # Set up port forwarding again for Marionette, since any that
         # existed previously got wiped out by the reboot.
         if not self._is_emulator:
             self._devicemanager.checkCmd(['forward',
                                           'tcp:%s' % self.marionette.port,
                                           'tcp:%s' % self.marionette.port])
 
-        time.sleep(5)
+        if self._is_emulator:
+            self.marionette.emulator.wait_for_port()
+        else:
+            time.sleep(5)
 
         # start a marionette session
         session = self.marionette.start_session()
         if 'b2g' not in session:
             raise Exception("bad session value %s returned by start_session" % session)
 
         # Start the tests by navigating to the mochitest url, by setting it
         # as the 'src' attribute to the homescreen mozbrowser element
@@ -269,17 +272,17 @@ class B2GRemoteAutomation(Automation):
             proc.daemon = True
             proc.start()
 
         def _save_stdout_proc(self, cmd, queue):
             self.stdout_proc = StdOutProc(cmd, queue)
             self.stdout_proc.run()
             if hasattr(self.stdout_proc, 'processOutput'):
                 self.stdout_proc.processOutput()
-            self.stdout_proc.waitForFinish(timeout=10)
+            self.stdout_proc.waitForFinish()
             self.stdout_proc = None
 
         @property
         def pid(self):
             # a dummy value to make the automation happy
             return 0
 
         @property