mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 06:11:37 +00:00
Bug 1155338 - Move mach command arguments into mochitest harness, r=chmanchester,gbrown
--HG-- extra : rebase_source : 60275814c319afd866de426cb8b2937a3adbcb34 extra : source : f4f4e2be37652cb1dc23f066725a0f8868bb411b
This commit is contained in:
Andrew Halberstadt
parent
ba57b3774a
commit
457f496287
@ -7,8 +7,7 @@ config = {
|
||||
"mochitest": {
|
||||
"run_filename": "runtestsremote.py",
|
||||
"testsdir": "mochitest",
|
||||
"options": ["--autorun", "--close-when-done", "--dm_trans=adb",
|
||||
"--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"options": ["--dm_trans=adb", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
|
||||
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
||||
"--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
|
||||
@ -19,8 +18,7 @@ config = {
|
||||
"mochitest-gl": {
|
||||
"run_filename": "runtestsremote.py",
|
||||
"testsdir": "mochitest",
|
||||
"options": ["--autorun", "--close-when-done", "--dm_trans=adb",
|
||||
"--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"options": ["--dm_trans=adb", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
|
||||
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
||||
"--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
|
||||
@ -32,16 +30,15 @@ config = {
|
||||
"robocop": {
|
||||
"run_filename": "runtestsremote.py",
|
||||
"testsdir": "mochitest",
|
||||
"options": ["--autorun", "--close-when-done", "--dm_trans=adb",
|
||||
"--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"options": ["--dm_trans=adb", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
|
||||
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
||||
"--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
|
||||
"--quiet", "--log-raw=%(raw_log_file)s",
|
||||
"--total-chunks=4",
|
||||
"--robocop-path=../..",
|
||||
"--robocop-apk=../../robocop.apk",
|
||||
"--robocop-ids=fennec_ids.txt",
|
||||
"--robocop=robocop.ini",
|
||||
"--robocop-ini=robocop.ini",
|
||||
],
|
||||
},
|
||||
"reftest": {
|
||||
|
||||
@ -7,8 +7,7 @@ config = {
|
||||
"mochitest": {
|
||||
"run_filename": "runtestsremote.py",
|
||||
"testsdir": "mochitest",
|
||||
"options": ["--autorun", "--close-when-done", "--dm_trans=sut",
|
||||
"--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"options": ["--dm_trans=sut", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
|
||||
"--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
|
||||
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
||||
@ -20,8 +19,7 @@ config = {
|
||||
"mochitest-gl": {
|
||||
"run_filename": "runtestsremote.py",
|
||||
"testsdir": "mochitest",
|
||||
"options": ["--autorun", "--close-when-done", "--dm_trans=sut",
|
||||
"--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"options": ["--dm_trans=sut", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
|
||||
"--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
|
||||
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
||||
@ -34,17 +32,16 @@ config = {
|
||||
"robocop": {
|
||||
"run_filename": "runtestsremote.py",
|
||||
"testsdir": "mochitest",
|
||||
"options": ["--autorun", "--close-when-done", "--dm_trans=sut",
|
||||
"--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"options": ["--dm_trans=sut", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
|
||||
"--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
|
||||
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
||||
"--certificate-path=%(certs_path)s", "--symbols-path=%(symbols_path)s",
|
||||
"--quiet", "--log-raw=%(raw_log_file)s",
|
||||
"--total-chunks=4",
|
||||
"--robocop-path=../..",
|
||||
"--robocop-apk=../../robocop.apk",
|
||||
"--robocop-ids=fennec_ids.txt",
|
||||
"--robocop=robocop.ini",
|
||||
"--robocop-ini=robocop.ini",
|
||||
],
|
||||
},
|
||||
"reftest": {
|
||||
|
||||
@ -8,7 +8,7 @@ config = {
|
||||
"options": [
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--xre-path=tests/bin",
|
||||
"--dm_trans=SUT",
|
||||
"--dm_trans=sut",
|
||||
"--deviceIP=%(device_ip)s",
|
||||
"--localBinDir=../tests/bin",
|
||||
"--apk=%(apk_path)s",
|
||||
@ -69,12 +69,12 @@ config = {
|
||||
},
|
||||
"mochitest": {
|
||||
"options": [
|
||||
"--dm_trans=sut",
|
||||
"--deviceIP=%(device_ip)s",
|
||||
"--xre-path=../hostutils/xre",
|
||||
"--utility-path=../hostutils/bin",
|
||||
"--certificate-path=certs",
|
||||
"--app=%(app_name)s",
|
||||
"--console-level=INFO",
|
||||
"--http-port=%(http_port)s",
|
||||
"--ssl-port=%(ssl_port)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
@ -102,6 +102,7 @@ config = {
|
||||
},
|
||||
"robocop": {
|
||||
"options": [
|
||||
"--dm_trans=sut",
|
||||
"--deviceIP=%(device_ip)s",
|
||||
"--xre-path=../hostutils/xre",
|
||||
"--utility-path=../hostutils/bin",
|
||||
@ -111,7 +112,7 @@ config = {
|
||||
"--http-port=%(http_port)s",
|
||||
"--ssl-port=%(ssl_port)s",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--robocop=mochitest/robocop.ini"
|
||||
"--robocop-ini=mochitest/robocop.ini"
|
||||
],
|
||||
"run_filename": "runtestsremote.py",
|
||||
"testsdir": "mochitest"
|
||||
|
||||
@ -6,8 +6,7 @@ config = {
|
||||
"suite_definitions": {
|
||||
"mochitest": {
|
||||
"run_filename": "runtestsremote.py",
|
||||
"options": ["--autorun", "--close-when-done", "--dm_trans=sut",
|
||||
"--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"options": ["--dm_trans=sut", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
|
||||
"--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",
|
||||
"--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
|
||||
"--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
|
||||
|
||||
@ -6,7 +6,6 @@ config = {
|
||||
"suite_definitions": {
|
||||
"mochitest": {
|
||||
"options": [
|
||||
"--console-level=INFO",
|
||||
"--total-chunks=%(total_chunks)s",
|
||||
"--this-chunk=%(this_chunk)s",
|
||||
"--profile=%(gaia_profile)s",
|
||||
|
||||
@ -61,7 +61,6 @@ config = {
|
||||
"options": [
|
||||
"--adbpath=%(adbpath)s",
|
||||
"--b2gpath=%(b2gpath)s",
|
||||
"--console-level=INFO",
|
||||
"--emulator=%(emulator)s",
|
||||
"--logdir=%(logcat_dir)s",
|
||||
"--remote-webserver=%(remote_webserver)s",
|
||||
@ -82,7 +81,6 @@ config = {
|
||||
"options": [
|
||||
"--adbpath=%(adbpath)s",
|
||||
"--b2gpath=%(b2gpath)s",
|
||||
"--console-level=INFO",
|
||||
"--emulator=%(emulator)s",
|
||||
"--logdir=%(logcat_dir)s",
|
||||
"--remote-webserver=%(remote_webserver)s",
|
||||
|
||||
@ -30,9 +30,6 @@ config = {
|
||||
"--extra-profile-file=tests/bin/plugins",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--certificate-path=tests/certs",
|
||||
"--autorun",
|
||||
"--close-when-done",
|
||||
"--console-level=INFO",
|
||||
"--setpref=webgl.force-enabled=true",
|
||||
"--quiet",
|
||||
"--log-raw=%(raw_log_file)s",
|
||||
|
||||
@ -30,9 +30,6 @@ config = {
|
||||
"--extra-profile-file=tests/bin/plugins",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--certificate-path=tests/certs",
|
||||
"--autorun",
|
||||
"--close-when-done",
|
||||
"--console-level=INFO",
|
||||
"--quiet",
|
||||
"--log-raw=%(raw_log_file)s"
|
||||
],
|
||||
|
||||
@ -10,8 +10,7 @@ config = {
|
||||
"mochitest_options": [
|
||||
"--appname=%(binary_path)s", "--utility-path=tests/bin",
|
||||
"--extra-profile-file=tests/bin/plugins", "--symbols-path=%(symbols_path)s",
|
||||
"--certificate-path=tests/certs", "--autorun", "--close-when-done",
|
||||
"--console-level=INFO", "--setpref=webgl.force-enabled=true",
|
||||
"--certificate-path=tests/certs", "--setpref=webgl.force-enabled=true",
|
||||
"--quiet", "--log-raw=%(raw_log_file)s"
|
||||
],
|
||||
"webapprt_options": [
|
||||
|
||||
@ -30,9 +30,6 @@ config = {
|
||||
"--extra-profile-file=tests/bin/plugins",
|
||||
"--symbols-path=%(symbols_path)s",
|
||||
"--certificate-path=tests/certs",
|
||||
"--autorun",
|
||||
"--close-when-done",
|
||||
"--console-level=INFO",
|
||||
"--quiet",
|
||||
"--log-raw=%(raw_log_file)s"
|
||||
],
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import argparse
|
||||
from argparse import Namespace
|
||||
import logging
|
||||
import mozpack.path as mozpath
|
||||
import os
|
||||
@ -24,8 +24,8 @@ from mach.decorators import (
|
||||
Command,
|
||||
)
|
||||
|
||||
here = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
from mozlog import structured
|
||||
|
||||
ADB_NOT_FOUND = '''
|
||||
The %s command requires the adb binary to be on your path.
|
||||
@ -117,18 +117,7 @@ class MochitestRunner(MozbuildObject):
|
||||
'mochitest')
|
||||
self.bin_dir = os.path.join(self.topobjdir, 'dist', 'bin')
|
||||
|
||||
def run_b2g_test(
|
||||
self,
|
||||
test_paths=None,
|
||||
b2g_home=None,
|
||||
xre_path=None,
|
||||
total_chunks=None,
|
||||
this_chunk=None,
|
||||
no_window=None,
|
||||
repeat=0,
|
||||
run_until_failure=False,
|
||||
chrome=False,
|
||||
**kwargs):
|
||||
def run_b2g_test(self, test_paths=None, **kwargs):
|
||||
"""Runs a b2g mochitest.
|
||||
|
||||
test_paths is an enumerable of paths to tests. It can be a relative path
|
||||
@ -157,13 +146,11 @@ class MochitestRunner(MozbuildObject):
|
||||
('.py', 'r', imp.PY_SOURCE))
|
||||
|
||||
import mochitest
|
||||
from mochitest_options import B2GOptions
|
||||
|
||||
parser = B2GOptions()
|
||||
options = parser.parse_args([])
|
||||
options = Namespace(**kwargs)
|
||||
|
||||
if test_path:
|
||||
if chrome:
|
||||
if options.chrome:
|
||||
test_root_file = mozpath.join(
|
||||
self.mochitest_dir,
|
||||
'chrome',
|
||||
@ -180,125 +167,33 @@ class MochitestRunner(MozbuildObject):
|
||||
return 1
|
||||
options.testPath = test_path
|
||||
|
||||
for k, v in kwargs.iteritems():
|
||||
setattr(options, k, v)
|
||||
options.noWindow = no_window
|
||||
options.totalChunks = total_chunks
|
||||
options.thisChunk = this_chunk
|
||||
options.repeat = repeat
|
||||
options.runUntilFailure = run_until_failure
|
||||
|
||||
options.symbolsPath = os.path.join(
|
||||
self.distdir,
|
||||
'crashreporter-symbols')
|
||||
|
||||
options.consoleLevel = 'INFO'
|
||||
if conditions.is_b2g_desktop(self):
|
||||
options.desktop = True
|
||||
options.app = self.get_binary_path()
|
||||
if not options.app.endswith('-bin'):
|
||||
options.app = '%s-bin' % options.app
|
||||
if not os.path.isfile(options.app):
|
||||
options.app = options.app[:-len('-bin')]
|
||||
|
||||
return mochitest.run_desktop_mochitests(parser, options)
|
||||
if options.desktop:
|
||||
return mochitest.run_desktop_mochitests(options)
|
||||
|
||||
try:
|
||||
which.which('adb')
|
||||
except which.WhichError:
|
||||
# TODO Find adb automatically if it isn't on the path
|
||||
print(ADB_NOT_FOUND % ('mochitest-remote', b2g_home))
|
||||
print(ADB_NOT_FOUND % ('mochitest-remote', options.b2gPath))
|
||||
return 1
|
||||
|
||||
options.b2gPath = b2g_home
|
||||
options.logdir = self.mochitest_dir
|
||||
options.httpdPath = self.mochitest_dir
|
||||
options.xrePath = xre_path
|
||||
options.chrome = chrome
|
||||
return mochitest.run_remote_mochitests(parser, options)
|
||||
return mochitest.run_remote_mochitests(options)
|
||||
|
||||
def run_desktop_test(
|
||||
self,
|
||||
context,
|
||||
suite=None,
|
||||
test_paths=None,
|
||||
debugger=None,
|
||||
debugger_args=None,
|
||||
slowscript=False,
|
||||
screenshot_on_fail=False,
|
||||
shuffle=False,
|
||||
closure_behaviour='auto',
|
||||
rerun_failures=False,
|
||||
no_autorun=False,
|
||||
repeat=0,
|
||||
run_until_failure=False,
|
||||
slow=False,
|
||||
chunk_by_dir=0,
|
||||
chunk_by_runtime=False,
|
||||
total_chunks=None,
|
||||
this_chunk=None,
|
||||
extraPrefs=[],
|
||||
jsdebugger=False,
|
||||
debug_on_failure=False,
|
||||
start_at=None,
|
||||
end_at=None,
|
||||
e10s=False,
|
||||
enable_cpow_warnings=False,
|
||||
strict_content_sandbox=False,
|
||||
nested_oop=False,
|
||||
dmd=False,
|
||||
dump_output_directory=None,
|
||||
dump_about_memory_after_test=False,
|
||||
dump_dmd_after_test=False,
|
||||
install_extension=None,
|
||||
quiet=False,
|
||||
environment=[],
|
||||
app_override=None,
|
||||
bisectChunk=None,
|
||||
runByDir=False,
|
||||
useTestMediaDevices=False,
|
||||
timeout=None,
|
||||
max_timeouts=None,
|
||||
**kwargs):
|
||||
def run_desktop_test(self, context, suite=None, test_paths=None, **kwargs):
|
||||
"""Runs a mochitest.
|
||||
|
||||
test_paths are path to tests. They can be a relative path from the
|
||||
top source directory, an absolute filename, or a directory containing
|
||||
test files.
|
||||
|
||||
suite is the type of mochitest to run. It can be one of ('plain',
|
||||
'chrome', 'browser', 'metro', 'a11y', 'jetpack-package', 'jetpack-addon').
|
||||
|
||||
debugger is a program name or path to a binary (presumably a debugger)
|
||||
to run the test in. e.g. 'gdb'
|
||||
|
||||
debugger_args are the arguments passed to the debugger.
|
||||
|
||||
slowscript is true if the user has requested the SIGSEGV mechanism of
|
||||
invoking the slow script dialog.
|
||||
|
||||
shuffle is whether test order should be shuffled (defaults to false).
|
||||
|
||||
closure_behaviour denotes whether to keep the browser open after tests
|
||||
complete.
|
||||
test_paths are path to tests. They can be a relative path from the
|
||||
top source directory, an absolute filename, or a directory containing
|
||||
test files.
|
||||
"""
|
||||
if rerun_failures and test_paths:
|
||||
print('Cannot specify both --rerun-failures and a test path.')
|
||||
return 1
|
||||
|
||||
# Make absolute paths relative before calling os.chdir() below.
|
||||
if test_paths:
|
||||
test_paths = [self._wrap_path_argument(
|
||||
p).relpath() if os.path.isabs(p) else p for p in test_paths]
|
||||
|
||||
failure_file_path = os.path.join(
|
||||
self.statedir,
|
||||
'mochitest_failures.json')
|
||||
|
||||
if rerun_failures and not os.path.exists(failure_file_path):
|
||||
print('No failure file present. Did you run mochitests before?')
|
||||
return 1
|
||||
|
||||
# runtests.py is ambiguous, so we load the file/module manually.
|
||||
if 'mochitest' not in sys.modules:
|
||||
import imp
|
||||
@ -321,13 +216,10 @@ class MochitestRunner(MozbuildObject):
|
||||
for handler in remove_handlers:
|
||||
logging.getLogger().removeHandler(handler)
|
||||
|
||||
opts = mochitest.MochitestOptions()
|
||||
options = opts.parse_args([])
|
||||
options = Namespace(**kwargs)
|
||||
|
||||
options.subsuite = ''
|
||||
flavor = suite
|
||||
|
||||
# Need to set the suite options before verifyOptions below.
|
||||
if suite == 'plain':
|
||||
# Don't need additional options for plain.
|
||||
flavor = 'mochitest'
|
||||
@ -338,6 +230,7 @@ class MochitestRunner(MozbuildObject):
|
||||
flavor = 'browser-chrome'
|
||||
elif suite == 'devtools':
|
||||
options.browserChrome = True
|
||||
options.subsuite = 'devtools'
|
||||
elif suite == 'jetpack-package':
|
||||
options.jetpackPackage = True
|
||||
elif suite == 'jetpack-addon':
|
||||
@ -349,70 +242,16 @@ class MochitestRunner(MozbuildObject):
|
||||
options.a11y = True
|
||||
elif suite == 'webapprt-content':
|
||||
options.webapprtContent = True
|
||||
if not options.app or options.app == self.get_binary_path():
|
||||
options.app = self.get_webapp_runtime_path()
|
||||
elif suite == 'webapprt-chrome':
|
||||
options.webapprtChrome = True
|
||||
options.app = self.get_webapp_runtime_path()
|
||||
options.browserArgs.append("-test-mode")
|
||||
if not options.app or options.app == self.get_binary_path():
|
||||
options.app = self.get_webapp_runtime_path()
|
||||
else:
|
||||
raise Exception('None or unrecognized mochitest suite type.')
|
||||
|
||||
if dmd:
|
||||
options.dmdPath = self.bin_dir
|
||||
|
||||
options.autorun = not no_autorun
|
||||
options.closeWhenDone = closure_behaviour != 'open'
|
||||
options.slowscript = slowscript
|
||||
options.screenshotOnFail = screenshot_on_fail
|
||||
options.shuffle = shuffle
|
||||
options.consoleLevel = 'INFO'
|
||||
options.repeat = repeat
|
||||
options.runUntilFailure = run_until_failure
|
||||
options.runSlower = slow
|
||||
options.testingModulesDir = os.path.join(self.tests_dir, 'modules')
|
||||
options.extraProfileFiles.append(os.path.join(self.distdir, 'plugins'))
|
||||
options.symbolsPath = os.path.join(
|
||||
self.distdir,
|
||||
'crashreporter-symbols')
|
||||
options.chunkByDir = chunk_by_dir
|
||||
options.chunkByRuntime = chunk_by_runtime
|
||||
options.totalChunks = total_chunks
|
||||
options.thisChunk = this_chunk
|
||||
options.jsdebugger = jsdebugger
|
||||
options.debugOnFailure = debug_on_failure
|
||||
options.startAt = start_at
|
||||
options.endAt = end_at
|
||||
options.e10s = e10s
|
||||
options.enableCPOWWarnings = enable_cpow_warnings
|
||||
options.strictContentSandbox = strict_content_sandbox
|
||||
options.nested_oop = nested_oop
|
||||
options.dumpAboutMemoryAfterTest = dump_about_memory_after_test
|
||||
options.dumpDMDAfterTest = dump_dmd_after_test
|
||||
options.dumpOutputDirectory = dump_output_directory
|
||||
options.quiet = quiet
|
||||
options.environment = environment
|
||||
options.extraPrefs = extraPrefs
|
||||
options.bisectChunk = bisectChunk
|
||||
options.runByDir = runByDir
|
||||
options.useTestMediaDevices = useTestMediaDevices
|
||||
if timeout:
|
||||
options.timeout = int(timeout)
|
||||
if max_timeouts:
|
||||
options.maxTimeouts = int(max_timeouts)
|
||||
|
||||
options.failureFile = failure_file_path
|
||||
if install_extension is not None:
|
||||
options.extensionsToInstall = [
|
||||
os.path.join(
|
||||
self.topsrcdir,
|
||||
install_extension)]
|
||||
|
||||
for k, v in kwargs.iteritems():
|
||||
setattr(options, k, v)
|
||||
|
||||
if suite == 'devtools':
|
||||
options.subsuite = 'devtools'
|
||||
|
||||
if test_paths:
|
||||
resolver = self._spawn(TestResolver)
|
||||
|
||||
@ -430,68 +269,19 @@ class MochitestRunner(MozbuildObject):
|
||||
manifest = TestManifest()
|
||||
manifest.tests.extend(tests)
|
||||
|
||||
if len(
|
||||
tests) == 1 and closure_behaviour == 'auto' and suite == 'plain':
|
||||
# XXX why is this such a special case?
|
||||
if len(tests) == 1 and options.closeWhenDone and suite == 'plain':
|
||||
options.closeWhenDone = False
|
||||
|
||||
options.manifestFile = manifest
|
||||
|
||||
if rerun_failures:
|
||||
options.testManifest = failure_file_path
|
||||
|
||||
if debugger:
|
||||
options.debugger = debugger
|
||||
|
||||
if debugger_args:
|
||||
if options.debugger is None:
|
||||
print("--debugger-args passed, but no debugger specified.")
|
||||
return 1
|
||||
options.debuggerArgs = debugger_args
|
||||
|
||||
if app_override:
|
||||
if app_override == "dist":
|
||||
options.app = self.get_binary_path(where='staged-package')
|
||||
elif app_override:
|
||||
options.app = app_override
|
||||
if options.gmp_path is None:
|
||||
# Need to fix the location of gmp_fake which might not be
|
||||
# shipped in the binary
|
||||
bin_path = self.get_binary_path()
|
||||
gmp_modules = (
|
||||
('gmp-fake', '1.0'),
|
||||
('gmp-clearkey', '0.1'),
|
||||
('gmp-fakeopenh264', '1.0')
|
||||
)
|
||||
options.gmp_path = os.pathsep.join(
|
||||
os.path.join(os.path.dirname(bin_path), *p)
|
||||
for p in gmp_modules)
|
||||
|
||||
logger_options = {
|
||||
key: value for key,
|
||||
value in vars(options).iteritems() if key.startswith('log')}
|
||||
runner = mochitest.Mochitest(logger_options)
|
||||
options = opts.verifyOptions(options, runner)
|
||||
|
||||
if options is None:
|
||||
raise Exception('mochitest option validator failed.')
|
||||
|
||||
# We need this to enable colorization of output.
|
||||
self.log_manager.enable_unstructured()
|
||||
|
||||
result = runner.runTests(options)
|
||||
|
||||
result = mochitest.run_test_harness(options)
|
||||
self.log_manager.disable_unstructured()
|
||||
if runner.message_logger.errors:
|
||||
result = 1
|
||||
runner.message_logger.logger.warning("The following tests failed:")
|
||||
for error in runner.message_logger.errors:
|
||||
runner.message_logger.logger.log_raw(error)
|
||||
|
||||
runner.message_logger.finish()
|
||||
|
||||
return result
|
||||
|
||||
def run_android_test(self, args):
|
||||
def run_android_test(self, test_path, **kwargs):
|
||||
self.tests_dir = os.path.join(self.topobjdir, '_tests')
|
||||
self.mochitest_dir = os.path.join(self.tests_dir, 'testing', 'mochitest')
|
||||
import imp
|
||||
@ -501,297 +291,43 @@ class MochitestRunner(MozbuildObject):
|
||||
('.py', 'r', imp.PY_SOURCE))
|
||||
import runtestsremote
|
||||
|
||||
sys.exit(runtestsremote.main(args))
|
||||
options = Namespace(**kwargs)
|
||||
if test_path:
|
||||
options.testPath = test_path
|
||||
|
||||
def add_mochitest_general_args(parser):
|
||||
parser.add_argument(
|
||||
'--debugger',
|
||||
'-d',
|
||||
metavar='DEBUGGER',
|
||||
help='Debugger binary to run test in. Program name or path.')
|
||||
|
||||
parser.add_argument(
|
||||
'--debugger-args',
|
||||
metavar='DEBUGGER_ARGS',
|
||||
help='Arguments to pass to the debugger.')
|
||||
|
||||
# Bug 933807 introduced JS_DISABLE_SLOW_SCRIPT_SIGNALS to avoid clever
|
||||
# segfaults induced by the slow-script-detecting logic for Ion/Odin JITted
|
||||
# code. If we don't pass this, the user will need to periodically type
|
||||
# "continue" to (safely) resume execution. There are ways to implement
|
||||
# automatic resuming; see the bug.
|
||||
parser.add_argument(
|
||||
'--slowscript',
|
||||
action='store_true',
|
||||
help='Do not set the JS_DISABLE_SLOW_SCRIPT_SIGNALS env variable; when not set, recoverable but misleading SIGSEGV instances may occur in Ion/Odin JIT code')
|
||||
|
||||
parser.add_argument(
|
||||
'--screenshot-on-fail',
|
||||
action='store_true',
|
||||
help='Take screenshots on all test failures. Set $MOZ_UPLOAD_DIR to a directory for storing the screenshots.')
|
||||
|
||||
parser.add_argument(
|
||||
'--shuffle', action='store_true',
|
||||
help='Shuffle execution order.')
|
||||
|
||||
parser.add_argument(
|
||||
'--keep-open',
|
||||
action='store_const',
|
||||
dest='closure_behaviour',
|
||||
const='open',
|
||||
default='auto',
|
||||
help='Always keep the browser open after tests complete.')
|
||||
|
||||
parser.add_argument(
|
||||
'--auto-close',
|
||||
action='store_const',
|
||||
dest='closure_behaviour',
|
||||
const='close',
|
||||
default='auto',
|
||||
help='Always close the browser after tests complete.')
|
||||
|
||||
parser.add_argument(
|
||||
'--rerun-failures',
|
||||
action='store_true',
|
||||
help='Run only the tests that failed during the last test run.')
|
||||
|
||||
parser.add_argument(
|
||||
'--no-autorun',
|
||||
action='store_true',
|
||||
help='Do not starting running tests automatically.')
|
||||
|
||||
parser.add_argument(
|
||||
'--repeat', type=int, default=0,
|
||||
help='Repeat the test the given number of times.')
|
||||
|
||||
parser.add_argument(
|
||||
"--run-until-failure",
|
||||
action='store_true',
|
||||
help='Run tests repeatedly and stops on the first time a test fails. '
|
||||
'Default cap is 30 runs, which can be overwritten '
|
||||
'with the --repeat parameter.')
|
||||
|
||||
parser.add_argument(
|
||||
'--slow', action='store_true',
|
||||
help='Delay execution between tests.')
|
||||
|
||||
parser.add_argument(
|
||||
'--end-at',
|
||||
type=str,
|
||||
help='Stop running the test sequence at this test.')
|
||||
|
||||
parser.add_argument(
|
||||
'--start-at',
|
||||
type=str,
|
||||
help='Start running the test sequence at this test.')
|
||||
|
||||
parser.add_argument(
|
||||
'--chunk-by-dir',
|
||||
type=int,
|
||||
help='Group tests together in chunks by this many top directories.')
|
||||
|
||||
parser.add_argument(
|
||||
'--chunk-by-runtime',
|
||||
action='store_true',
|
||||
help="Group tests such that each chunk has roughly the same runtime.")
|
||||
|
||||
parser.add_argument(
|
||||
'--total-chunks',
|
||||
type=int,
|
||||
help='Total number of chunks to split tests into.')
|
||||
|
||||
parser.add_argument(
|
||||
'--this-chunk',
|
||||
type=int,
|
||||
help='If running tests by chunks, the number of the chunk to run.')
|
||||
|
||||
parser.add_argument(
|
||||
'--debug-on-failure',
|
||||
action='store_true',
|
||||
help='Breaks execution and enters the JS debugger on a test failure. '
|
||||
'Should be used together with --jsdebugger.')
|
||||
|
||||
parser.add_argument(
|
||||
'--setpref', default=[], action='append',
|
||||
metavar='PREF=VALUE', dest='extraPrefs',
|
||||
help='defines an extra user preference')
|
||||
|
||||
parser.add_argument(
|
||||
'--jsdebugger',
|
||||
action='store_true',
|
||||
help='Start the browser JS debugger before running the test. Implies --no-autorun.')
|
||||
|
||||
parser.add_argument(
|
||||
'--e10s',
|
||||
action='store_true',
|
||||
help='Run tests with electrolysis preferences and test filtering enabled.')
|
||||
|
||||
parser.add_argument(
|
||||
'--enable-cpow-warnings',
|
||||
action='store_true',
|
||||
help='Run tests with unsafe CPOW usage warnings enabled.')
|
||||
|
||||
parser.add_argument(
|
||||
'--strict-content-sandbox',
|
||||
action='store_true',
|
||||
help='Run tests with a more strict content sandbox (Windows only).')
|
||||
|
||||
parser.add_argument(
|
||||
'--nested_oop',
|
||||
action='store_true',
|
||||
help='Run tests with nested oop preferences and test filtering enabled.')
|
||||
|
||||
parser.add_argument(
|
||||
'--dmd', action='store_true',
|
||||
help='Run tests with DMD active.')
|
||||
|
||||
parser.add_argument(
|
||||
'--dump-about-memory-after-test',
|
||||
action='store_true',
|
||||
help='Dump an about:memory log after every test.')
|
||||
|
||||
parser.add_argument(
|
||||
'--dump-dmd-after-test', action='store_true',
|
||||
help='Dump a DMD log after every test.')
|
||||
|
||||
parser.add_argument(
|
||||
'--dump-output-directory',
|
||||
action='store',
|
||||
help='Specifies the directory in which to place dumped memory reports.')
|
||||
|
||||
parser.add_argument(
|
||||
'test_paths',
|
||||
default=None,
|
||||
nargs='*',
|
||||
metavar='TEST',
|
||||
help='Test to run. Can be specified as a single file, a '
|
||||
'directory, or omitted. If omitted, the entire test suite is '
|
||||
'executed.')
|
||||
|
||||
parser.add_argument(
|
||||
'--install-extension',
|
||||
help='Install given extension before running selected tests. '
|
||||
'Parameter is a path to xpi file.')
|
||||
|
||||
parser.add_argument(
|
||||
'--quiet',
|
||||
default=False,
|
||||
action='store_true',
|
||||
help='Do not print test log lines unless a failure occurs.')
|
||||
|
||||
parser.add_argument(
|
||||
'--setenv',
|
||||
default=[],
|
||||
action='append',
|
||||
metavar='NAME=VALUE',
|
||||
dest='environment',
|
||||
help="Sets the given variable in the application's environment")
|
||||
|
||||
parser.add_argument(
|
||||
'--run-by-dir',
|
||||
default=False,
|
||||
action='store_true',
|
||||
dest='runByDir',
|
||||
help='Run each directory in a single browser instance with a fresh profile.')
|
||||
|
||||
parser.add_argument(
|
||||
'--bisect-chunk',
|
||||
type=str,
|
||||
dest='bisectChunk',
|
||||
help='Specify the failing test name to find the previous tests that may be causing the failure.')
|
||||
|
||||
parser.add_argument(
|
||||
'--use-test-media-devices',
|
||||
default=False,
|
||||
action='store_true',
|
||||
dest='useTestMediaDevices',
|
||||
help='Use test media device drivers for media testing.')
|
||||
|
||||
parser.add_argument(
|
||||
'--app-override',
|
||||
default=None,
|
||||
action='store',
|
||||
help="Override the default binary used to run tests with the path you provide, e.g. "
|
||||
" --app-override /usr/bin/firefox . "
|
||||
"If you have run ./mach package beforehand, you can specify 'dist' to "
|
||||
"run tests against the distribution bundle's binary.")
|
||||
|
||||
parser.add_argument(
|
||||
'--timeout',
|
||||
default=None,
|
||||
help='The per-test timeout time in seconds (default: 60 seconds)')
|
||||
|
||||
parser.add_argument(
|
||||
'--max-timeouts', default=None,
|
||||
help='The maximum number of timeouts permitted before halting testing')
|
||||
|
||||
parser.add_argument(
|
||||
"--tag",
|
||||
dest='test_tags', action='append',
|
||||
help="Filter out tests that don't have the given tag. Can be used "
|
||||
"multiple times in which case the test must contain at least one "
|
||||
"of the given tags.")
|
||||
|
||||
parser.add_argument(
|
||||
"--subsuite",
|
||||
default=None,
|
||||
help="Subsuite of tests to run. Unlike tags, subsuites also remove "
|
||||
"tests from the default set. Only one can be specified at once.")
|
||||
sys.exit(runtestsremote.run_test_harness(options))
|
||||
|
||||
|
||||
return parser
|
||||
# parser
|
||||
|
||||
def add_mochitest_b2g_args(parser):
|
||||
parser.add_argument(
|
||||
'--busybox',
|
||||
default=None,
|
||||
help='Path to busybox binary to install on device')
|
||||
|
||||
parser.add_argument(
|
||||
'--logdir', default=None,
|
||||
help='directory to store log files')
|
||||
|
||||
parser.add_argument(
|
||||
'--profile', default=None,
|
||||
help='for desktop testing, the path to the \
|
||||
gaia profile to use')
|
||||
|
||||
parser.add_argument(
|
||||
'--gecko-path', default=None,
|
||||
help='the path to a gecko distribution that should \
|
||||
be installed on the emulator prior to test')
|
||||
|
||||
parser.add_argument(
|
||||
'--no-window',
|
||||
action='store_true',
|
||||
default=False,
|
||||
help='Pass --no-window to the emulator')
|
||||
|
||||
parser.add_argument(
|
||||
'--sdcard', default="10MB",
|
||||
help='Define size of sdcard: 1MB, 50MB...etc')
|
||||
|
||||
parser.add_argument(
|
||||
'--marionette',
|
||||
default=None,
|
||||
help='host:port to use when connecting to Marionette')
|
||||
|
||||
return parser
|
||||
def TestPathArg(func):
|
||||
test_paths = CommandArgument('test_paths', nargs='*', metavar='TEST', default=None,
|
||||
help='Test to run. Can be a single test file or a directory of tests to '
|
||||
'(run recursively). If omitted, the entire suite is run.')
|
||||
return test_paths(func)
|
||||
|
||||
|
||||
def setup_argument_parser():
|
||||
parser = argparse.ArgumentParser()
|
||||
build_obj = MozbuildObject.from_environment(cwd=here)
|
||||
|
||||
general_args = parser.add_argument_group('Mochitest Arguments',
|
||||
'Arguments that apply to all versions of mochitest.')
|
||||
general_args = add_mochitest_general_args(general_args)
|
||||
build_path = os.path.join(build_obj.topobjdir, 'build')
|
||||
if build_path not in sys.path:
|
||||
sys.path.append(build_path)
|
||||
|
||||
b2g_args = parser.add_argument_group('B2G Arguments', 'Arguments specific \
|
||||
to running mochitest on B2G devices and emulator')
|
||||
b2g_args = add_mochitest_b2g_args(b2g_args)
|
||||
mochitest_dir = os.path.join(build_obj.topobjdir, '_tests', 'testing', 'mochitest')
|
||||
|
||||
structured.commandline.add_logging_group(parser)
|
||||
return parser
|
||||
with warnings.catch_warnings():
|
||||
warnings.simplefilter('ignore')
|
||||
|
||||
import imp
|
||||
path = os.path.join(build_obj.topobjdir, mochitest_dir, 'runtests.py')
|
||||
with open(path, 'r') as fh:
|
||||
imp.load_module('mochitest', fh, path,
|
||||
('.py', 'r', imp.PY_SOURCE))
|
||||
|
||||
from mochitest_options import MochitestArgumentParser
|
||||
|
||||
return MochitestArgumentParser()
|
||||
|
||||
|
||||
# condition filters
|
||||
@ -808,6 +344,7 @@ def is_platform_in(*platforms):
|
||||
' or '.join(platforms))
|
||||
return is_platform_supported
|
||||
|
||||
|
||||
def verify_host_bin():
|
||||
# validate MOZ_HOST_BIN environment variables for Android tests
|
||||
MOZ_HOST_BIN = os.environ.get('MOZ_HOST_BIN')
|
||||
@ -822,13 +359,14 @@ def verify_host_bin():
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
@CommandProvider
|
||||
class MachCommands(MachCommandBase):
|
||||
|
||||
def __init__(self, context):
|
||||
MachCommandBase.__init__(self, context)
|
||||
|
||||
for attr in ('b2g_home', 'xre_path', 'device_name', 'target_out'):
|
||||
for attr in ('device_name', 'target_out'):
|
||||
setattr(self, attr, getattr(context, attr, None))
|
||||
|
||||
@Command(
|
||||
@ -837,6 +375,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[is_platform_in('firefox', 'mulet', 'b2g', 'b2g_desktop', 'android')],
|
||||
description='Run a plain mochitest (integration test, plain web page).',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_plain(self, test_paths, **kwargs):
|
||||
if is_platform_in('firefox', 'mulet')(self):
|
||||
return self.run_mochitest(test_paths, 'plain', **kwargs)
|
||||
@ -853,13 +392,15 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[is_platform_in('firefox', 'emulator', 'android')],
|
||||
description='Run a chrome mochitest (integration test with some XUL).',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_chrome(self, test_paths, **kwargs):
|
||||
kwargs['chrome'] = True
|
||||
if conditions.is_firefox(self):
|
||||
return self.run_mochitest(test_paths, 'chrome', **kwargs)
|
||||
elif conditions.is_b2g(self) and conditions.is_emulator(self):
|
||||
return self.run_mochitest_remote(test_paths, chrome=True, **kwargs)
|
||||
return self.run_mochitest_remote(test_paths, **kwargs)
|
||||
elif conditions.is_android(self):
|
||||
return self.run_mochitest_android(test_paths, chrome=True, **kwargs)
|
||||
return self.run_mochitest_android(test_paths, **kwargs)
|
||||
|
||||
@Command(
|
||||
'mochitest-browser',
|
||||
@ -867,6 +408,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[conditions.is_firefox],
|
||||
description='Run a mochitest with browser chrome (integration test with a standard browser).',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_browser(self, test_paths, **kwargs):
|
||||
return self.run_mochitest(test_paths, 'browser', **kwargs)
|
||||
|
||||
@ -876,6 +418,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[conditions.is_firefox],
|
||||
description='Run a devtools mochitest with browser chrome (integration test with a standard browser with the devtools frame).',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_devtools(self, test_paths, **kwargs):
|
||||
return self.run_mochitest(test_paths, 'devtools', **kwargs)
|
||||
|
||||
@ -883,6 +426,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[conditions.is_firefox],
|
||||
description='Run a jetpack package test.',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_jetpack_package(self, test_paths, **kwargs):
|
||||
return self.run_mochitest(test_paths, 'jetpack-package', **kwargs)
|
||||
|
||||
@ -890,6 +434,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[conditions.is_firefox],
|
||||
description='Run a jetpack addon test.',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_jetpack_addon(self, test_paths, **kwargs):
|
||||
return self.run_mochitest(test_paths, 'jetpack-addon', **kwargs)
|
||||
|
||||
@ -899,6 +444,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[conditions.is_firefox],
|
||||
description='Run a mochitest with metro browser chrome (tests for Windows touch interface).',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_metro(self, test_paths, **kwargs):
|
||||
return self.run_mochitest(test_paths, 'metro', **kwargs)
|
||||
|
||||
@ -906,6 +452,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[conditions.is_firefox],
|
||||
description='Run an a11y mochitest (accessibility tests).',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_a11y(self, test_paths, **kwargs):
|
||||
return self.run_mochitest(test_paths, 'a11y', **kwargs)
|
||||
|
||||
@ -915,6 +462,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[conditions.is_firefox],
|
||||
description='Run a webapprt chrome mochitest (Web App Runtime with the browser chrome).',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_webapprt_chrome(self, test_paths, **kwargs):
|
||||
return self.run_mochitest(test_paths, 'webapprt-chrome', **kwargs)
|
||||
|
||||
@ -924,6 +472,7 @@ class MachCommands(MachCommandBase):
|
||||
conditions=[conditions.is_firefox],
|
||||
description='Run a webapprt content mochitest (Content rendering of the Web App Runtime).',
|
||||
parser=setup_argument_parser)
|
||||
@TestPathArg
|
||||
def run_mochitest_webapprt_content(self, test_paths, **kwargs):
|
||||
return self.run_mochitest(test_paths, 'webapprt-content', **kwargs)
|
||||
|
||||
@ -933,6 +482,7 @@ class MachCommands(MachCommandBase):
|
||||
parser=setup_argument_parser)
|
||||
@CommandArgument('-f', '--flavor', choices=FLAVORS.keys(),
|
||||
help='Only run tests of this flavor.')
|
||||
@TestPathArg
|
||||
def run_mochitest_general(self, test_paths, flavor=None, test_objects=None,
|
||||
**kwargs):
|
||||
self._preruntest()
|
||||
@ -1019,12 +569,6 @@ class MachCommands(MachCommandBase):
|
||||
|
||||
from mozbuild.controller.building import BuildDriver
|
||||
|
||||
if self.device_name.startswith('emulator'):
|
||||
emulator = 'arm'
|
||||
if 'x86' in self.device_name:
|
||||
emulator = 'x86'
|
||||
kwargs['emulator'] = emulator
|
||||
|
||||
self._ensure_state_subdir_exists('.')
|
||||
|
||||
driver = self._spawn(BuildDriver)
|
||||
@ -1032,8 +576,6 @@ class MachCommands(MachCommandBase):
|
||||
|
||||
mochitest = self._spawn(MochitestRunner)
|
||||
return mochitest.run_b2g_test(
|
||||
b2g_home=self.b2g_home,
|
||||
xre_path=self.xre_path,
|
||||
test_paths=test_paths,
|
||||
**kwargs)
|
||||
|
||||
@ -1060,39 +602,28 @@ class MachCommands(MachCommandBase):
|
||||
mochitest = self._spawn(MochitestRunner)
|
||||
return mochitest.run_b2g_test(test_paths=test_paths, **kwargs)
|
||||
|
||||
def run_mochitest_android(self, test_paths, chrome=False, **kwargs):
|
||||
def run_mochitest_android(self, test_paths, **kwargs):
|
||||
host_ret = verify_host_bin()
|
||||
if host_ret != 0:
|
||||
return host_ret
|
||||
|
||||
args = [
|
||||
'--xre-path=' + os.environ.get('MOZ_HOST_BIN'),
|
||||
'--dm_trans=adb',
|
||||
'--deviceIP=',
|
||||
'--console-level=INFO',
|
||||
'--app=' + self.substs['ANDROID_PACKAGE_NAME'],
|
||||
'--log-mach=-',
|
||||
'--autorun',
|
||||
'--close-when-done',
|
||||
'--testing-modules-dir=' + os.path.join(self.topobjdir, '_tests', 'modules'),
|
||||
]
|
||||
test_path = None
|
||||
if test_paths:
|
||||
if len(test_paths) > 1:
|
||||
print('Warning: Only the first test path will be used.')
|
||||
test_path = self._wrap_path_argument(test_paths[0]).relpath()
|
||||
args.append('--test-path=%s' % test_path)
|
||||
if chrome:
|
||||
args.append('--chrome')
|
||||
|
||||
mochitest = self._spawn(MochitestRunner)
|
||||
return mochitest.run_android_test(args)
|
||||
return mochitest.run_android_test(test_path, **kwargs)
|
||||
|
||||
|
||||
@CommandProvider
|
||||
class AndroidCommands(MachCommandBase):
|
||||
|
||||
@Command('robocop', category='testing',
|
||||
conditions=[conditions.is_android],
|
||||
description='Run a Robocop test.')
|
||||
description='Run a Robocop test.',
|
||||
parser=setup_argument_parser)
|
||||
@CommandArgument(
|
||||
'test_path',
|
||||
default=None,
|
||||
@ -1100,37 +631,17 @@ class AndroidCommands(MachCommandBase):
|
||||
metavar='TEST',
|
||||
help='Test to run. Can be specified as a Robocop test name (like "testLoad"), '
|
||||
'or omitted. If omitted, the entire test suite is executed.')
|
||||
def run_robocop(self, test_path):
|
||||
def run_robocop(self, test_path, **kwargs):
|
||||
host_ret = verify_host_bin()
|
||||
if host_ret != 0:
|
||||
return host_ret
|
||||
|
||||
args = [
|
||||
'--xre-path=' + os.environ.get('MOZ_HOST_BIN'),
|
||||
'--dm_trans=adb',
|
||||
'--deviceIP=',
|
||||
'--console-level=INFO',
|
||||
'--app=' +
|
||||
self.substs['ANDROID_PACKAGE_NAME'],
|
||||
'--robocop-apk=' +
|
||||
os.path.join(
|
||||
self.topobjdir,
|
||||
'build',
|
||||
'mobile',
|
||||
'robocop',
|
||||
'robocop-debug.apk'),
|
||||
'--robocop-ini=' +
|
||||
os.path.join(
|
||||
self.topobjdir,
|
||||
'_tests',
|
||||
'testing',
|
||||
'mochitest',
|
||||
'robocop.ini'),
|
||||
'--log-mach=-',
|
||||
]
|
||||
|
||||
if test_path:
|
||||
args.append('--test-path=%s' % test_path)
|
||||
if not kwargs.get('robocopIni'):
|
||||
kwargs['robocopIni'] = os.path.join(self.topobjdir, '_tests', 'testing',
|
||||
'mochitest', 'robocop.ini')
|
||||
|
||||
if not kwargs.get('robocopApk'):
|
||||
kwargs['robocopApk'] = os.path.join(self.topobjdir, 'build', 'mobile',
|
||||
'robocop', 'robocop-debug.apk')
|
||||
mochitest = self._spawn(MochitestRunner)
|
||||
return mochitest.run_android_test(args)
|
||||
return mochitest.run_android_test(test_path, **kwargs)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -53,13 +53,21 @@ from manifestparser.filters import (
|
||||
subsuite,
|
||||
tags,
|
||||
)
|
||||
from mochitest_options import MochitestOptions
|
||||
from mochitest_options import MochitestArgumentParser
|
||||
from mozprofile import Profile, Preferences
|
||||
from mozprofile.permissions import ServerLocations
|
||||
from urllib import quote_plus as encodeURIComponent
|
||||
from mozlog.structured.formatters import TbplFormatter
|
||||
from mozlog.structured import commandline
|
||||
|
||||
here = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
try:
|
||||
from mozbuild.base import MozbuildObject
|
||||
build_obj = MozbuildObject.from_environment(cwd=here)
|
||||
except ImportError:
|
||||
build_obj = None
|
||||
|
||||
|
||||
###########################
|
||||
# Option for NSPR logging #
|
||||
@ -2595,29 +2603,34 @@ class Mochitest(MochitestUtilsMixin):
|
||||
return dirlist
|
||||
|
||||
|
||||
def main():
|
||||
def run_test_harness(options):
|
||||
logger_options = {
|
||||
key: value for key, value in vars(options).iteritems() if key.startswith('log')}
|
||||
runner = Mochitest(logger_options)
|
||||
result = runner.runTests(options)
|
||||
|
||||
# don't dump failures if running from automation as treeherder already displays them
|
||||
if build_obj:
|
||||
if runner.message_logger.errors:
|
||||
result = 1
|
||||
runner.message_logger.logger.warning("The following tests failed:")
|
||||
for error in runner.message_logger.errors:
|
||||
runner.message_logger.logger.log_raw(error)
|
||||
|
||||
runner.message_logger.finish()
|
||||
|
||||
return result
|
||||
|
||||
|
||||
def cli(args=sys.argv[1:]):
|
||||
# parse command line options
|
||||
parser = MochitestOptions()
|
||||
commandline.add_logging_group(parser)
|
||||
options = parser.parse_args()
|
||||
parser = MochitestArgumentParser(app='generic')
|
||||
options = parser.parse_args(args)
|
||||
if options is None:
|
||||
# parsing error
|
||||
sys.exit(1)
|
||||
logger_options = {
|
||||
key: value for key,
|
||||
value in vars(options).iteritems() if key.startswith('log')}
|
||||
mochitest = Mochitest(logger_options)
|
||||
options = parser.verifyOptions(options, mochitest)
|
||||
|
||||
options.utilityPath = mochitest.getFullPath(options.utilityPath)
|
||||
options.certPath = mochitest.getFullPath(options.certPath)
|
||||
if options.symbolsPath and len(urlparse(options.symbolsPath).scheme) < 2:
|
||||
options.symbolsPath = mochitest.getFullPath(options.symbolsPath)
|
||||
|
||||
return_code = mochitest.runTests(options)
|
||||
mochitest.message_logger.finish()
|
||||
|
||||
sys.exit(return_code)
|
||||
return run_test_harness(options)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
sys.exit(cli())
|
||||
|
||||
@ -17,7 +17,7 @@ sys.path.insert(0, here)
|
||||
from automationutils import processLeakLog
|
||||
from runtests import Mochitest
|
||||
from runtests import MochitestUtilsMixin
|
||||
from mochitest_options import B2GOptions, MochitestOptions
|
||||
from mochitest_options import MochitestArgumentParser
|
||||
from marionette import Marionette
|
||||
from mozprofile import Profile, Preferences
|
||||
from mozlog import structured
|
||||
@ -417,7 +417,7 @@ class B2GDesktopMochitest(B2GMochitest, Mochitest):
|
||||
return self.build_profile(options)
|
||||
|
||||
|
||||
def run_remote_mochitests(parser, options):
|
||||
def run_remote_mochitests(options):
|
||||
# create our Marionette instance
|
||||
marionette_args = {
|
||||
'adb_path': options.adbPath,
|
||||
@ -434,7 +434,6 @@ def run_remote_mochitests(parser, options):
|
||||
marionette_args['host'] = host
|
||||
marionette_args['port'] = int(port)
|
||||
|
||||
options = parser.verifyRemoteOptions(options)
|
||||
if (options is None):
|
||||
print "ERROR: Invalid options specified, use --help for a list of valid options"
|
||||
sys.exit(1)
|
||||
@ -446,7 +445,6 @@ def run_remote_mochitests(parser, options):
|
||||
options.xrePath,
|
||||
remote_log_file=options.remoteLogFile)
|
||||
|
||||
options = parser.verifyOptions(options, mochitest)
|
||||
if (options is None):
|
||||
sys.exit(1)
|
||||
|
||||
@ -469,7 +467,7 @@ def run_remote_mochitests(parser, options):
|
||||
sys.exit(retVal)
|
||||
|
||||
|
||||
def run_desktop_mochitests(parser, options):
|
||||
def run_desktop_mochitests(options):
|
||||
# create our Marionette instance
|
||||
marionette_args = {}
|
||||
if options.marionette:
|
||||
@ -486,7 +484,6 @@ def run_desktop_mochitests(parser, options):
|
||||
marionette_args,
|
||||
options,
|
||||
options.profile_data_dir)
|
||||
options = MochitestOptions.verifyOptions(parser, options, mochitest)
|
||||
if options is None:
|
||||
sys.exit(1)
|
||||
|
||||
@ -502,14 +499,13 @@ def run_desktop_mochitests(parser, options):
|
||||
|
||||
|
||||
def main():
|
||||
parser = B2GOptions()
|
||||
structured.commandline.add_logging_group(parser)
|
||||
parser = MochitestArgumentParser(app='b2g')
|
||||
options = parser.parse_args()
|
||||
|
||||
if options.desktop:
|
||||
run_desktop_mochitests(parser, options)
|
||||
run_desktop_mochitests(options)
|
||||
else:
|
||||
run_remote_mochitests(parser, options)
|
||||
run_remote_mochitests(options)
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
@ -18,13 +18,11 @@ sys.path.insert(
|
||||
from automation import Automation
|
||||
from remoteautomation import RemoteAutomation, fennecLogcatFilters
|
||||
from runtests import Mochitest, MessageLogger
|
||||
from mochitest_options import RemoteOptions
|
||||
from mozlog import structured
|
||||
from mochitest_options import MochitestArgumentParser
|
||||
|
||||
from manifestparser import TestManifest
|
||||
from manifestparser.filters import chunk_by_slice
|
||||
import devicemanager
|
||||
import droid
|
||||
import mozinfo
|
||||
|
||||
SCRIPT_DIR = os.path.abspath(os.path.realpath(os.path.dirname(__file__)))
|
||||
@ -461,40 +459,16 @@ class MochiRemote(Mochitest):
|
||||
return self._automation.runApp(*args, **kwargs)
|
||||
|
||||
|
||||
def main(args):
|
||||
def run_test_harness(options):
|
||||
message_logger = MessageLogger(logger=None)
|
||||
process_args = {'messageLogger': message_logger}
|
||||
auto = RemoteAutomation(None, "fennec", processArgs=process_args)
|
||||
|
||||
parser = RemoteOptions(auto)
|
||||
structured.commandline.add_logging_group(parser)
|
||||
options = parser.parse_args(args)
|
||||
|
||||
if (options.dm_trans == "adb"):
|
||||
if (options.deviceIP):
|
||||
dm = droid.DroidADB(
|
||||
options.deviceIP,
|
||||
options.devicePort,
|
||||
deviceRoot=options.remoteTestRoot)
|
||||
elif (options.deviceSerial):
|
||||
dm = droid.DroidADB(
|
||||
None,
|
||||
None,
|
||||
deviceSerial=options.deviceSerial,
|
||||
deviceRoot=options.remoteTestRoot)
|
||||
else:
|
||||
dm = droid.DroidADB(deviceRoot=options.remoteTestRoot)
|
||||
else:
|
||||
dm = droid.DroidSUT(
|
||||
options.deviceIP,
|
||||
options.devicePort,
|
||||
deviceRoot=options.remoteTestRoot)
|
||||
auto.setDeviceManager(dm)
|
||||
options = parser.verifyRemoteOptions(options, auto)
|
||||
|
||||
if options is None:
|
||||
raise ValueError("Invalid options specified, use --help for a list of valid options")
|
||||
|
||||
dm = options.dm
|
||||
auto.setDeviceManager(dm)
|
||||
mochitest = MochiRemote(auto, dm, options)
|
||||
|
||||
log = mochitest.log
|
||||
@ -508,10 +482,6 @@ def main(args):
|
||||
auto.setProduct(options.remoteProductName)
|
||||
auto.setAppName(options.remoteappname)
|
||||
|
||||
options = parser.verifyOptions(options, mochitest)
|
||||
if (options is None):
|
||||
return 1
|
||||
|
||||
logParent = os.path.dirname(options.remoteLogFile)
|
||||
dm.mkDir(logParent)
|
||||
auto.setRemoteLog(options.remoteLogFile)
|
||||
@ -738,5 +708,12 @@ def main(args):
|
||||
return retVal
|
||||
|
||||
|
||||
def main(args=sys.argv[1:]):
|
||||
parser = MochitestArgumentParser(app='android')
|
||||
options = parser.parse_args(args)
|
||||
|
||||
return run_test_harness(options)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main(sys.argv[1:]))
|
||||
sys.exit(main())
|
||||
|
||||
@ -29,16 +29,16 @@ endif
|
||||
|
||||
RUN_MOCHITEST_B2G_DESKTOP = \
|
||||
rm -f ./$@.log && \
|
||||
$(PYTHON) _tests/testing/mochitest/runtestsb2g.py --autorun --close-when-done \
|
||||
--console-level=INFO --log-tbpl=./$@.log \
|
||||
$(PYTHON) _tests/testing/mochitest/runtestsb2g.py \
|
||||
--log-tbpl=./$@.log \
|
||||
--desktop --profile ${GAIA_PROFILE_DIR} \
|
||||
--failure-file=$(abspath _tests/testing/mochitest/makefailures.json) \
|
||||
$(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
|
||||
|
||||
RUN_MOCHITEST = \
|
||||
rm -f ./$@.log && \
|
||||
$(PYTHON) _tests/testing/mochitest/runtests.py --autorun --close-when-done \
|
||||
--console-level=INFO --log-tbpl=./$@.log \
|
||||
$(PYTHON) _tests/testing/mochitest/runtests.py \
|
||||
--log-tbpl=./$@.log \
|
||||
--failure-file=$(abspath _tests/testing/mochitest/makefailures.json) \
|
||||
--testing-modules-dir=$(abspath _tests/modules) \
|
||||
--extra-profile-file=$(DIST)/plugins \
|
||||
@ -46,8 +46,8 @@ RUN_MOCHITEST = \
|
||||
|
||||
RERUN_MOCHITEST = \
|
||||
rm -f ./$@.log && \
|
||||
$(PYTHON) _tests/testing/mochitest/runtests.py --autorun --close-when-done \
|
||||
--console-level=INFO --log-tbpl=./$@.log \
|
||||
$(PYTHON) _tests/testing/mochitest/runtests.py \
|
||||
--log-tbpl=./$@.log \
|
||||
--run-only-tests=makefailures.json \
|
||||
--testing-modules-dir=$(abspath _tests/modules) \
|
||||
--extra-profile-file=$(DIST)/plugins \
|
||||
@ -55,8 +55,8 @@ RERUN_MOCHITEST = \
|
||||
|
||||
RUN_MOCHITEST_REMOTE = \
|
||||
rm -f ./$@.log && \
|
||||
$(PYTHON) _tests/testing/mochitest/runtestsremote.py --autorun --close-when-done \
|
||||
--console-level=INFO --log-tbpl=./$@.log $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
|
||||
$(PYTHON) _tests/testing/mochitest/runtestsremote.py \
|
||||
--log-tbpl=./$@.log $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
|
||||
--app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
|
||||
--testing-modules-dir=$(abspath _tests/modules) \
|
||||
$(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
|
||||
@ -67,7 +67,7 @@ RUN_MOCHITEST_ROBOCOP = \
|
||||
--robocop-apk=$(DEPTH)/build/mobile/robocop/robocop-debug.apk \
|
||||
--robocop-ids=$(DEPTH)/mobile/android/base/fennec_ids.txt \
|
||||
--robocop-ini=_tests/testing/mochitest/robocop.ini \
|
||||
--console-level=INFO --log-tbpl=./$@.log $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
|
||||
--log-tbpl=./$@.log $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
|
||||
--app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
|
||||
$(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user