Bug 1322993 - Guard against deleting nonexistent directory during emulator cleanup; r?whimboo
MozReview-Commit-ID: 7hopCdbHhj1
--- a/testing/mozbase/mozrunner/mozrunner/devices/emulator.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/emulator.py
@@ -160,17 +160,18 @@ class BaseEmulator(Device):
"""
super(BaseEmulator, self).cleanup()
if self.proc:
self.proc.kill()
self.proc = None
self.connected = False
# Remove temporary files
- shutil.rmtree(self.tmpdir)
+ if os.path.isdir(self.tempdir):
+ shutil.rmtree(self.tmpdir)
def _get_telnet_response(self, command=None):
output = []
assert self.telnet
if command is not None:
self.telnet.write('%s\n' % command)
while True:
line = self.telnet.read_until('\n')