Bug 1019604 - Avoid mochitest cleanup failure following error; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Tue, 03 Jun 2014 08:19:37 -0600
changeset 205576 c10a85fa06f0479710d2447447fcff757bfdb40d
parent 205575 fb0790d288468ad9c9eca03ec060e42d2f09d49f
child 205577 d6dc9b7afda43cebe335482aefd795cd8de42159
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1019604
milestone32.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 1019604 - Avoid mochitest cleanup failure following error; r=jmaher
testing/mochitest/runtestsremote.py
--- a/testing/mochitest/runtestsremote.py
+++ b/testing/mochitest/runtestsremote.py
@@ -242,17 +242,18 @@ class MochiRemote(Mochitest):
     def cleanup(self, manifest, options):
         if self._dm.fileExists(self.remoteLog):
             self._dm.getFile(self.remoteLog, self.localLog)
             self._dm.removeFile(self.remoteLog)
         else:
             log.warn("Unable to retrieve log file (%s) from remote device",
                 self.remoteLog)
         self._dm.removeDir(self.remoteProfile)
-        Mochitest.cleanup(self, manifest, options)
+        if manifest is not None:
+            Mochitest.cleanup(self, manifest, options)
 
     def findPath(self, paths, filename = None):
         for path in paths:
             p = path
             if filename:
                 p = os.path.join(p, filename)
             if os.path.exists(self.getFullPath(p)):
                 return path