From 315729a1519f766b62129bc951c5881d0f14129c Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Mon, 8 Sep 2014 16:23:09 -0700 Subject: [PATCH] Bug 929654 - Part 0: Stop pushing fennec_ids.txt; delete stale robotium.config files. r=gbrown This patch stops pushing the obsolete fennec_ids.txt file to the testing device and deletes the stale robotium.config file after the profile it references is deleted. --- testing/mochitest/runtestsremote.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testing/mochitest/runtestsremote.py b/testing/mochitest/runtestsremote.py index 1bcbcd75ae2..8bed46322e6 100644 --- a/testing/mochitest/runtestsremote.py +++ b/testing/mochitest/runtestsremote.py @@ -252,6 +252,10 @@ class MochiRemote(Mochitest): else: self.log.warning("Unable to retrieve log file (%s) from remote device" % self.remoteLog) self._dm.removeDir(self.remoteProfile) + # Don't leave an old robotium.config hanging around; the + # profile it references was just deleted! + deviceRoot = self._dm.getDeviceRoot() + self._dm.removeFile(os.path.join(deviceRoot, "robotium.config")) blobberUploadDir = os.environ.get('MOZ_UPLOAD_DIR', None) if blobberUploadDir: self._dm.getDirectory(self.remoteNSPR, blobberUploadDir) @@ -674,11 +678,6 @@ def main(): my_tests = tests[start:end] log.info("Running tests %d-%d/%d" % (start+1, end, len(tests))) - dm.removeFile(os.path.join(deviceRoot, "fennec_ids.txt")) - fennec_ids = os.path.abspath(os.path.join(SCRIPT_DIR, "fennec_ids.txt")) - if not os.path.exists(fennec_ids) and options.robocopIds: - fennec_ids = options.robocopIds - dm.pushFile(fennec_ids, os.path.join(deviceRoot, "fennec_ids.txt")) options.extraPrefs.append('browser.search.suggest.enabled=true') options.extraPrefs.append('browser.search.suggest.prompted=true') options.extraPrefs.append('layout.css.devPixelsPerPx=1.0')