From ae9e1f533d64b93a2a1aaf3774ebf2a6f03e38e0 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Wed, 27 Aug 2014 16:23:29 -0600 Subject: [PATCH] Bug 1059293 - Avoid MOZ_UPLOAD_DIR failure when running tests locally; r=dminor --- testing/mochitest/runtestsremote.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py index 6729240b6517..3c431971444c 100644 --- a/testing/mochitest/runtestsremote.py +++ b/testing/mochitest/runtestsremote.py @@ -252,7 +252,9 @@ class MochiRemote(Mochitest): else: self.log.warning("Unable to retrieve log file (%s) from remote device" % self.remoteLog) self._dm.removeDir(self.remoteProfile) - self._dm.getDirectory(self.remoteNSPR, os.environ["MOZ_UPLOAD_DIR"]) + blobberUploadDir = os.environ.get('MOZ_UPLOAD_DIR', None) + if blobberUploadDir: + self._dm.getDirectory(self.remoteNSPR, blobberUploadDir) Mochitest.cleanup(self, options) def findPath(self, paths, filename = None):