Bug 1316552 - Marionette has to force close the application in case of socket failures. r=automatedtester
authorHenrik Skupin <mail@hskupin.info>
Thu, 10 Nov 2016 12:51:07 +0100
changeset 352022 0d6a2bc1dc0f8aa9c1ccdbf36dda905bd4d69a45
parent 352021 b3ad07be866f0d891fdfca9b8e6077431b5b52a7
child 352023 496f18cd01fe699632200eb17b703da8491ded8e
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester
bugs1316552
milestone52.0a1
Bug 1316552 - Marionette has to force close the application in case of socket failures. r=automatedtester MozReview-Commit-ID: EjDczrK8sBe
testing/marionette/client/marionette_driver/marionette.py
--- a/testing/marionette/client/marionette_driver/marionette.py
+++ b/testing/marionette/client/marionette_driver/marionette.py
@@ -806,17 +806,18 @@ class Marionette(object):
 
             # Somehow the socket disconnected. Give the application some time to shutdown
             # itself before killing the process.
             returncode = self.instance.runner.wait(timeout=self.DEFAULT_SHUTDOWN_TIMEOUT)
 
             if returncode is None:
                 message = ('Process killed because the connection to Marionette server is '
                            'lost. Check gecko.log for errors')
-                self.quit()
+                # This will force-close the application without sending any other message.
+                self.cleanup()
             else:
                 # If Firefox quit itself check if there was a crash
                 crash_count = self.check_for_crash()
 
                 if crash_count > 0:
                     if returncode == 0:
                         message = 'Content process crashed'
                     else: