Bug 981568: Handle if we get IOError if B2G crashes during a test run; r=jgriffin
authorDavid Burns <dburns@mozilla.com>
Tue, 11 Mar 2014 17:10:16 +0000
changeset 172984 0c7de28ed85433e43dbfb14ab223a6e3c8102bbe
parent 172983 9948eaf63a9546241106554d2d02351bef3b5879
child 172985 ff5ca7959511c5bcf717200b9939f6f612ab7153
push id40905
push userdburns@mozilla.com
push dateTue, 11 Mar 2014 17:10:25 +0000
treeherdermozilla-inbound@0c7de28ed854 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs981568
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 981568: Handle if we get IOError if B2G crashes during a test run; r=jgriffin
testing/marionette/client/marionette/marionette_test.py
--- a/testing/marionette/client/marionette/marionette_test.py
+++ b/testing/marionette/client/marionette/marionette_test.py
@@ -284,17 +284,17 @@ permissions.forEach(function (perm) {
         if hasattr(self.marionette, 'session'):
             if self.marionette.session is not None:
                 try:
                     self.loglines.extend(self.marionette.get_logs())
                 except Exception, inst:
                     self.loglines = [['Error getting log: %s' % inst]]
                 try:
                     self.marionette.delete_session()
-                except (socket.error, MarionetteException):
+                except (socket.error, MarionetteException, IOError):
                     # Gecko has crashed?
                     self.marionette.session = None
                     try:
                         self.marionette.client.close()
                     except socket.error:
                         pass
         self.marionette = None