wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 965782 - ignore certain delete_session exceptions in Marionette cleanup, r=wlach

Browse Source
This commit is contained in:
Malini Das 2014-01-30 15:14:04 -05:00
parent 207d08537d
commit f42da61fc8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
testing/marionette/client/marionette/marionette.py
View File

@ -517,7 +517,14 @@ class Marionette(object):
def cleanup(self):
if self.session:
self.delete_session()
try:
self.delete_session()
except (MarionetteException, socket.error):
# These exceptions get thrown if the Marionette server
# hit an exception/died or the connection died. We can
# do no further server-side cleanup in this case.
pass
self.session = None
if self.emulator:
self.emulator.close()
if self.instance: