Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1435624 - In Android mochitest-chrome, never push tests twice; r=jmaher

Browse Source
This commit is contained in:
Geoff Brown 2018-02-07 13:33:44 -07:00
parent 8b8a2994e8
commit 366841c755
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
testing/mochitest/runtests.py
View File

@ -1953,13 +1953,14 @@ toolbar#nav-bar {
return os.pathsep.join(gmp_paths)
def cleanup(self, options):
def cleanup(self, options, final=False):
""" remove temporary files and profile """
if hasattr(self, 'manifest') and self.manifest is not None:
os.remove(self.manifest)
if os.path.exists(self.manifest):
os.remove(self.manifest)
if hasattr(self, 'profile'):
del self.profile
if options.pidFile != "":
if options.pidFile != "" and os.path.exists(options.pidFile):
try:
os.remove(options.pidFile)
if os.path.exists(options.pidFile + ".xpcshell.pid"):
@ -2599,6 +2600,9 @@ toolbar#nav-bar {
if res == -1:
break
if self.manifest is not None:
self.cleanup(options, True)
e10s_mode = "e10s" if options.e10s else "non-e10s"
# printing total number of tests
@ -2814,7 +2818,7 @@ toolbar#nav-bar {
self.log.info("runtests.py | Running tests: end.")
if self.manifest is not None:
self.cleanup(options)
self.cleanup(options, False)
return status

33
testing/mochitest/runtestsremote.py
View File

@ -33,6 +33,7 @@ class MochiRemote(MochitestDesktop):
self._automation = automation
self._dm = devmgr
self.chromePushed = False
self.environment = self._automation.environment
self.remoteProfile = os.path.join(options.remoteTestRoot, "profile/")
self.remoteModulesDir = os.path.join(options.remoteTestRoot, "modules/")
@ -56,21 +57,24 @@ class MochiRemote(MochitestDesktop):
# move necko cache to a location that can be cleaned up
options.extraPrefs += ["browser.cache.disk.parent_directory=%s" % self.remoteCache]
def cleanup(self, options):
if self._dm.fileExists(self.remoteLog):
self._dm.getFile(self.remoteLog, self.localLog)
self._dm.removeFile(self.remoteLog)
def cleanup(self, options, final=False):
if final:
self._dm.removeDir(self.remoteChromeTestDir)
self.chromePushed = False
blobberUploadDir = os.environ.get('MOZ_UPLOAD_DIR', None)
if blobberUploadDir:
self._dm.getDirectory(self.remoteMozLog, blobberUploadDir)
else:
self.log.warning(
"Unable to retrieve log file (%s) from remote device" %
self.remoteLog)
self._dm.removeDir(self.remoteChromeTestDir)
if self._dm.fileExists(self.remoteLog):
self._dm.getFile(self.remoteLog, self.localLog)
self._dm.removeFile(self.remoteLog)
else:
self.log.warning(
"Unable to retrieve log file (%s) from remote device" %
self.remoteLog)
self._dm.removeDir(self.remoteProfile)
self._dm.removeDir(self.remoteCache)
blobberUploadDir = os.environ.get('MOZ_UPLOAD_DIR', None)
if blobberUploadDir:
self._dm.getDirectory(self.remoteMozLog, blobberUploadDir)
MochitestDesktop.cleanup(self, options)
MochitestDesktop.cleanup(self, options, final)
self.localProfile = None
def findPath(self, paths, filename=None):
@ -230,11 +234,12 @@ class MochiRemote(MochitestDesktop):
def getChromeTestDir(self, options):
local = super(MochiRemote, self).getChromeTestDir(options)
local = os.path.join(local, "chrome")
remote = self.remoteChromeTestDir
if options.flavor == 'chrome':
if options.flavor == 'chrome' and not self.chromePushed:
self.log.info("pushing %s to %s on device..." % (local, remote))
local = os.path.join(local, "chrome")
self._dm.pushDir(local, remote)
self.chromePushed = True
return remote
def getLogFilePath(self, logFile):