Bug 1359288 - Enable Android reftest to resume from crashes. r=jmaher

MozReview-Commit-ID: EqTOdEwfTWi

--HG--
extra : rebase_source : 36837b43159f484f911cf5183d81c3440d59736a
This commit is contained in:
Shing Lyu 2017-05-10 10:38:48 +08:00
Родитель 0c3fc26fc7
Коммит 65cb773340
5 изменённых файлов: 16 добавлений и 15 удалений

Просмотреть файл

@ -585,7 +585,7 @@ class Automation(object):
if os.path.exists(processLog): if os.path.exists(processLog):
os.unlink(processLog) os.unlink(processLog)
return status return status, self.lastTestSeen
def elf_arm(self, filename): def elf_arm(self, filename):
data = open(filename, 'rb').read(20) data = open(filename, 'rb').read(20)

Просмотреть файл

@ -312,7 +312,7 @@ class RemoteReftest(RefTest):
timeout=None, debuggerInfo=None, timeout=None, debuggerInfo=None,
symbolsPath=None, options=None, symbolsPath=None, options=None,
valgrindPath=None, valgrindArgs=None, valgrindSuppFiles=None): valgrindPath=None, valgrindArgs=None, valgrindSuppFiles=None):
status = self.automation.runApp(None, env, status, lastTestSeen = self.automation.runApp(None, env,
binary, binary,
profile.profile, profile.profile,
cmdargs, cmdargs,
@ -321,7 +321,7 @@ class RemoteReftest(RefTest):
debuggerInfo=debuggerInfo, debuggerInfo=debuggerInfo,
symbolsPath=symbolsPath, symbolsPath=symbolsPath,
timeout=timeout) timeout=timeout)
return status, None return status, lastTestSeen
def cleanup(self, profileDir): def cleanup(self, profileDir):
# Pull results back from device # Pull results back from device

Просмотреть файл

@ -459,7 +459,7 @@ class RobocopTestRunner(MochitestDesktop):
timeout = self.options.timeout timeout = self.options.timeout
if not timeout: if not timeout:
timeout = self.NO_OUTPUT_TIMEOUT timeout = self.NO_OUTPUT_TIMEOUT
result = self.auto.runApp( result, _ = self.auto.runApp(
None, browserEnv, "am", self.localProfile, browserArgs, None, browserEnv, "am", self.localProfile, browserArgs,
timeout=timeout, symbolsPath=self.options.symbolsPath) timeout=timeout, symbolsPath=self.options.symbolsPath)
self.log.debug("runApp completes with status %d" % result) self.log.debug("runApp completes with status %d" % result)

Просмотреть файл

@ -2168,7 +2168,7 @@ toolbar#nav-bar {
os.remove(processLog) os.remove(processLog)
self.urlOpts = [] self.urlOpts = []
return status return status, self.lastTestSeen
def initializeLooping(self, options): def initializeLooping(self, options):
""" """
@ -2489,7 +2489,7 @@ toolbar#nav-bar {
self.log.info("runtests.py | Running with e10s: {}".format(options.e10s)) self.log.info("runtests.py | Running with e10s: {}".format(options.e10s))
self.log.info("runtests.py | Running tests: start.\n") self.log.info("runtests.py | Running tests: start.\n")
ret = self.runApp( ret, _ = self.runApp(
testURL, testURL,
self.browserEnv, self.browserEnv,
options.app, options.app,

Просмотреть файл

@ -286,7 +286,8 @@ class MochiRemote(MochitestDesktop):
# remove args not supported by automation.py # remove args not supported by automation.py
kwargs.pop('marionette_args', None) kwargs.pop('marionette_args', None)
return self._automation.runApp(*args, **kwargs) ret, _ = self._automation.runApp(*args, **kwargs)
return ret, None
def run_test_harness(parser, options): def run_test_harness(parser, options):