--- a/steps/unittest.py
+++ b/steps/unittest.py
@@ -510,38 +510,16 @@ class MozillaPackagedXPCShellTests(XPCSh
if symbols_path:
script += " --symbols-path=%s" % symbols_path
script += " --manifest=xpcshell/tests/all-test-dirs.list %(exedir)s/xpcshell" + bin_extension
self.command = ['bash', '-c', WithProperties(script)]
-class MozillaPackagedReftests(ReftestMixin, ShellCommandReportTimeout):
- def __init__(self, suite, symbols_path=None, leakThreshold=None,
- **kwargs):
- self.super_class = ShellCommandReportTimeout
- ShellCommandReportTimeout.__init__(self, **kwargs)
-
- self.addFactoryArguments(suite=suite,
- symbols_path=symbols_path, leakThreshold=leakThreshold)
- self.name = suite
- self.command = ['python', 'reftest/runreftest.py',
- WithProperties('--appname=%(exepath)s'),
- '--utility-path=bin',
- '--extra-profile-file=bin/plugins',
- ]
- if symbols_path:
- self.command.append(
- WithProperties("--symbols-path=%s" % symbols_path))
- if leakThreshold:
- self.command.append('--leak-threshold=%d' % leakThreshold)
- self.command.extend(self.getSuiteOptions(suite))
-
-
class MozillaPackagedJetpackTests(ShellCommandReportTimeout):
warnOnFailure = True
warnOnWarnings = True
def __init__(self, suite, symbols_path=None, leakThreshold=None, **kwargs):
self.super_class = ShellCommandReportTimeout
ShellCommandReportTimeout.__init__(self, **kwargs)
@@ -571,139 +549,8 @@ class MozillaPackagedJetpackTests(ShellC
# need to use worst_status in further status decisions.
if superResult == FAILURE:
superResult = WARNINGS
if superResult != SUCCESS:
return worst_status(superResult, WARNINGS)
return worst_status(superResult, SUCCESS)
-
-
-class RemoteMochitestStep(MochitestMixin, ChunkingMixin, ShellCommandReportTimeout):
- def __init__(self, variant, symbols_path=None, testPath=None,
- xrePath='../hostutils/xre', testManifest=None,
- utilityPath='../hostutils/bin', certificatePath='certs',
- consoleLevel='INFO', totalChunks=None, thisChunk=None,
- **kwargs):
- self.super_class = ShellCommandReportTimeout
- ShellCommandReportTimeout.__init__(self, **kwargs)
-
- if totalChunks:
- assert 1 <= thisChunk <= totalChunks
-
- self.addFactoryArguments(variant=variant, symbols_path=symbols_path,
- testPath=testPath, xrePath=xrePath,
- testManifest=testManifest, utilityPath=utilityPath,
- certificatePath=certificatePath,
- consoleLevel=consoleLevel,
- totalChunks=totalChunks, thisChunk=thisChunk)
-
- self.name = 'mochitest-%s' % variant
- self.command = ['python', '-u', 'mochitest/runtestsremote.py',
- '--deviceIP', WithProperties('%(sut_ip)s'),
- '--xre-path', xrePath,
- '--utility-path', utilityPath,
- '--certificate-path', certificatePath,
- '--app', WithProperties("%(remoteProcessName)s"),
- '--console-level', consoleLevel,
- '--http-port', WithProperties('%(http_port)s'),
- '--ssl-port', WithProperties('%(ssl_port)s'),
- '--pidfile', WithProperties(
- '%(basedir)s/../runtestsremote.pid')
- ]
- self.command.extend(self.getVariantOptions(variant))
- if testPath:
- self.command.extend(['--test-path', testPath])
- if testManifest:
- self.command.extend(['--run-only-tests', testManifest])
- if symbols_path:
- self.command.append(
- WithProperties("--symbols-path=%s" % symbols_path))
- self.command.extend(self.getChunkOptions(totalChunks, thisChunk))
-
-
-class RemoteMochitestBrowserChromeStep(RemoteMochitestStep):
- def __init__(self, **kwargs):
- self.super_class = RemoteMochitestStep
- RemoteMochitestStep.__init__(self, **kwargs)
-
- def createSummary(self, log):
- self.addCompleteLog(
- 'summary', summarizeLogRemoteMochitest(self.name, log))
-
- def evaluateCommand(self, cmd):
- superResult = self.super_class.evaluateCommand(self, cmd)
- return evaluateRemoteMochitest(self.name, cmd.logs['stdio'].getText(),
- superResult)
-
-
-class RemoteReftestStep(ReftestMixin, ChunkingMixin, ShellCommandReportTimeout):
- def __init__(self, suite, symbols_path=None, xrePath='../hostutils/xre',
- utilityPath='../hostutils/bin', totalChunks=None,
- thisChunk=None, cmdOptions=None, extra_args=None, **kwargs):
- self.super_class = ShellCommandReportTimeout
- ShellCommandReportTimeout.__init__(self, **kwargs)
- self.addFactoryArguments(suite=suite, xrePath=xrePath,
- symbols_path=symbols_path,
- utilityPath=utilityPath,
- totalChunks=totalChunks, thisChunk=thisChunk,
- cmdOptions=cmdOptions, extra_args=extra_args)
-
- self.name = suite
- if totalChunks:
- self.name += '-%i' % thisChunk
- self.command = ['python', '-u', 'reftest/remotereftest.py',
- '--deviceIP', WithProperties('%(sut_ip)s'),
- '--xre-path', xrePath,
- '--utility-path', utilityPath,
- '--app', WithProperties("%(remoteProcessName)s"),
- '--http-port', WithProperties('%(http_port)s'),
- '--ssl-port', WithProperties('%(ssl_port)s'),
- '--pidfile', WithProperties(
- '%(basedir)s/../remotereftest.pid')
- ]
- if suite == 'jsreftest' or suite == 'crashtest':
- self.command.append('--ignore-window-size')
- if extra_args:
- self.command.append(extra_args)
-
- if cmdOptions:
- self.command.extend(cmdOptions)
- self.command.extend(self.getChunkOptions(totalChunks, thisChunk))
- self.command.extend(self.getSuiteOptions(suite))
-
- if symbols_path:
- self.command.append(
- WithProperties("--symbols-path=%s" % symbols_path))
-
-
-class RemoteXPCShellStep(XPCShellMixin, ChunkingMixin, ShellCommandReportTimeout):
- def __init__(self, suite, symbols_path=None, xrePath='../hostutils/xre',
- totalChunks=None, thisChunk=None, cmdOptions=None, extra_args=None, **kwargs):
- self.super_class = ShellCommandReportTimeout
- ShellCommandReportTimeout.__init__(self, **kwargs)
- self.addFactoryArguments(suite=suite, xrePath=xrePath,
- symbols_path=symbols_path,
- totalChunks=totalChunks, thisChunk=thisChunk,
- cmdOptions=cmdOptions, extra_args=extra_args)
-
- self.name = suite
- if totalChunks:
- self.name += '-%i' % thisChunk
-
- self.command = ['python2.7', '-u', 'xpcshell/remotexpcshelltests.py',
- '--deviceIP', WithProperties('%(sut_ip)s'),
- '--xre-path', xrePath,
- '--manifest', 'xpcshell/tests/xpcshell_android.ini',
- '--build-info-json', 'xpcshell/mozinfo.json',
- '--testing-modules-dir', 'modules',
- '--local-lib-dir', WithProperties('../%(exedir)s'),
- '--apk', WithProperties('../%(build_filename)s'),
- '--no-logfiles']
- if extra_args:
- self.command.append(extra_args)
-
- self.command.extend(self.getChunkOptions(totalChunks, thisChunk))
-
- if symbols_path:
- self.command.append(
- WithProperties("--symbols-path=%s" % symbols_path))