corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1523303 - Align mozharness suite names with the ones in 'moztest.resolve', r=gbrown

Browse Source 
This officially makes 'moztest.resolve' the source of truth when it comes to
suite names. It aligns that file with the names used in both the
desktop_unittest and android_emulator_unittest scripts.

Differential Revision: https://phabricator.services.mozilla.com/D27555
This commit is contained in:
Andrew Halberstadt
2019-04-22 22:32:34 +00:00
parent bae1df96b7
commit 03bc4efb44
17 changed files with 117 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
taskcluster/ci/test/mochitest.yml
View File

@@ -42,7 +42,7 @@ job-defaults:
mochitest:
description: "Mochitest plain run"
suite:
name: plain-chunked
name: mochitest-plain-chunked
treeherder-symbol: M()
loopback-video: true
tier:
@@ -83,7 +83,7 @@ mochitest:
extra-options:
by-test-platform:
android-em.*:
- --test-suite=mochitest
- --test-suite=mochitest-plain
default: []
chunked:
by-test-platform:
@@ -92,8 +92,6 @@ mochitest:
mochitest-a11y:
description: "Mochitest a11y run"
suite:
name: a11y
treeherder-symbol: M(a11y)
loopback-video: true
tier:
@@ -108,7 +106,7 @@ mochitest-a11y:
mochitest-browser-chrome:
description: "Mochitest browser-chrome run"
suite:
name: browser-chrome-chunked
name: mochitest-browser-chrome-chunked
treeherder-symbol: M(bc)
loopback-video: true
tier:
@@ -139,7 +137,7 @@ mochitest-browser-chrome:
browser-instrumentation:
description: "Extra instrumentation for a browser-chrome run (XUL, XBL, etc)"
suite:
name: browser-chrome-instrumentation
name: mochitest-browser-chrome-instrumentation
treeherder-symbol: M(inst)
loopback-video: true
tier: 3
@@ -155,7 +153,7 @@ browser-instrumentation:
browser-screenshots:
description: "Browser Screenshots"
suite:
name: browser-chrome-screenshots
name: mochitest-browser-chrome-screenshots
treeherder-symbol: M(ss)
loopback-video: true
run-on-projects:
@@ -173,8 +171,6 @@ browser-screenshots:
mochitest-chrome:
description: "Mochitest chrome run"
suite:
name: chrome
treeherder-symbol: M(c)
loopback-video: true
tier:
@@ -234,7 +230,7 @@ mochitest-clipboard:
# note that Android runs fewer suites than other platforms
- --test-suite=mochitest-plain-clipboard
default:
- --mochitest-suite=plain-clipboard,chrome-clipboard,browser-chrome-clipboard
- --mochitest-suite=mochitest-plain-clipboard,mochitest-chrome-clipboard,mochitest-browser-chrome-clipboard
mochitest-devtools-chrome:
description: "Mochitest devtools-chrome run"
@@ -287,7 +283,7 @@ mochitest-devtools-webreplay:
mochitest-gpu:
description: "Mochitest GPU run"
suite:
name: plain-gpu
name: mochitest-plain-gpu
treeherder-symbol: M(gpu)
loopback-video: true
tier:
@@ -311,7 +307,7 @@ mochitest-gpu:
# note that Android runs fewer suites than other platforms
- --test-suite=mochitest-plain-gpu
default:
- --mochitest-suite=plain-gpu,chrome-gpu,browser-chrome-gpu
- --mochitest-suite=mochitest-plain-gpu,mochitest-chrome-gpu,mochitest-browser-chrome-gpu
mochitest-media:
description: "Mochitest media run"
@@ -364,7 +360,7 @@ mochitest-media:
mochitest-plain-headless:
description: "Mochitest plain headless run"
suite:
name: plain-chunked
name: mochitest-plain-chunked
treeherder-symbol: M(h)
loopback-video: true
chunks:
@@ -387,7 +383,7 @@ mochitest-plain-headless:
mochitest-valgrind:
description: "Mochitest plain Valgrind run"
suite:
name: valgrind-plain
name: mochitest-valgrind-plain
treeherder-symbol: M-V()
run-on-projects: []
tier: 3

3
taskcluster/taskgraph/target_tasks.py
View File

@@ -236,8 +236,7 @@ def target_tasks_valgrind(full_task_graph, parameters, graph_config):
if platform not in ['linux64']:
return False
if task.attributes.get('unittest_suite', '').startswith('mochitest') and \
task.attributes.get('unittest_flavor', '').startswith('valgrind-plain'):
if task.attributes.get('unittest_suite', '').startswith('mochitest-valgrind-plain'):
return True
return False

2
testing/mach_commands.py
View File

@@ -350,7 +350,7 @@ class Test(MachCommandBase):
buckets.setdefault(key, []).append(test)
for (flavor, subsuite), tests in sorted(buckets.items()):
m = get_suite_definition(flavor, subsuite)
_, m = get_suite_definition(flavor, subsuite)
if 'mach_command' not in m:
substr = '-{}'.format(subsuite) if subsuite else ''
print(UNKNOWN_FLAVOR % (flavor, substr))

57
testing/mozbase/moztest/moztest/resolve.py
View File

@@ -30,7 +30,6 @@ def WebglSuite(name):
'kwargs': {'flavor': 'plain', 'subsuite': name, 'test_paths': None},
'task_regex': ['mochitest-' + name + '($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'mochitest-' + name
}
@@ -39,7 +38,6 @@ TEST_SUITES = {
'aliases': ('cpp',),
'mach_command': 'cppunittest',
'kwargs': {'test_file': None},
'mozharness_name': 'cppunittest',
},
'crashtest': {
'aliases': ('c', 'rc'),
@@ -47,7 +45,6 @@ TEST_SUITES = {
'kwargs': {'test_file': None},
'task_regex': ['crashtest($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'crashtest',
},
'firefox-ui-functional': {
'aliases': ('fxfn',),
@@ -82,23 +79,26 @@ TEST_SUITES = {
'kwargs': {'flavor': 'a11y', 'test_paths': None},
'task_regex': ['mochitest-a11y($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'a11y',
},
'mochitest-browser': {
'aliases': ('bc', 'browser-chrome'),
'mochitest-browser-chrome': {
'aliases': ('bc', 'browser'),
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'test_paths': None},
'task_regex': ['mochitest-browser-chrome($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'browser-chrome',
},
'mochitest-browser-clipboard': {
'mochitest-browser-chrome-clipboard': {
'aliases': ('cl', 'clipboard',),
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'clipboard', 'test_paths': None},
'task_regex': ['mochitest-clipboard($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'browser-chrome-clipboard',
},
'mochitest-browser-chrome-screenshots': {
'aliases': ('ss', 'screenshots-chrome'),
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'screenshots', 'test_paths': None},
'task_regex': ['browser-screenshots($|.*(-1|[^0-9])$)'],
},
'mochitest-chrome': {
'aliases': ('mc',),
@@ -106,7 +106,6 @@ TEST_SUITES = {
'kwargs': {'flavor': 'chrome', 'test_paths': None},
'task_regex': ['mochitest-chrome($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'chrome',
},
'mochitest-chrome-clipboard': {
'aliases': ('cl', 'clipboard',),
@@ -114,7 +113,6 @@ TEST_SUITES = {
'kwargs': {'flavor': 'chrome', 'subsuite': 'clipboard', 'test_paths': None},
'task_regex': ['mochitest-clipboard($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'chrome-clipboard',
},
'mochitest-chrome-gpu': {
'aliases': ('gpu',),
@@ -122,15 +120,13 @@ TEST_SUITES = {
'kwargs': {'flavor': 'chrome', 'subsuite': 'gpu', 'test_paths': None},
'task_regex': ['mochitest-gpu($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'chrome-gpu',
},
'mochitest-devtools': {
'aliases': ('dt', 'devtools-chrome'),
'mochitest-devtools-chrome': {
'aliases': ('dt', 'devtools'),
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'devtools', 'test_paths': None},
'task_regex': ['mochitest-devtools-chrome($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'mochitest-devtools-chrome',
},
'mochitest-media': {
'aliases': ('mpm', 'plain-media'),
@@ -138,7 +134,6 @@ TEST_SUITES = {
'kwargs': {'flavor': 'plain', 'subsuite': 'media', 'test_paths': None},
'task_regex': ['mochitest-media($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'mochitest-media',
},
'mochitest-plain': {
'aliases': ('mp', 'plain',),
@@ -146,7 +141,6 @@ TEST_SUITES = {
'kwargs': {'flavor': 'plain', 'test_paths': None},
'task_regex': ['mochitest(?!-a11y|-browser|-chrome|-clip|-devtools|-gpu|-harness|-media|-screen|-webgl)($|.*(-1|[^0-9])$)', # noqa
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'plain',
},
'mochitest-plain-clipboard': {
'aliases': ('cl', 'clipboard',),
@@ -154,7 +148,6 @@ TEST_SUITES = {
'kwargs': {'subsuite': 'clipboard', 'test_paths': None},
'task_regex': ['mochitest-clipboard($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'plain-clipboard',
},
'mochitest-plain-gpu': {
'aliases': ('gpu',),
@@ -162,14 +155,6 @@ TEST_SUITES = {
'kwargs': {'subsuite': 'gpu', 'test_paths': None},
'task_regex': ['mochitest-gpu($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'plain-gpu',
},
'mochitest-screenshots': {
'aliases': ('ss', 'screenshots-chrome'),
'mach_command': 'mochitest',
'kwargs': {'flavor': 'browser-chrome', 'subsuite': 'screenshots', 'test_paths': None},
'task_regex': ['browser-screenshots($|.*(-1|[^0-9])$)'],
'mozharness_name': 'browser-chrome-screenshots',
},
'mochitest-webgl1-core': WebglSuite('webgl1-core'),
'mochitest-webgl1-ext': WebglSuite('webgl1-ext'),
@@ -186,7 +171,6 @@ TEST_SUITES = {
'kwargs': {'tests': None},
'task_regex': ['(opt|debug)-reftest($|.*(-1|[^0-9])$)',
'test-verify-gpu($|.*(-1|[^0-9])$)'],
'mozharness_name': 'reftest',
},
'robocop': {
'mach_command': 'robocop',
@@ -232,7 +216,6 @@ TEST_SUITES = {
'kwargs': {'test_file': 'all'},
'task_regex': ['xpcshell($|.*(-1|[^0-9])$)',
'test-verify($|.*(-1|[^0-9])$)'],
'mozharness_name': 'xpcshell',
},
}
@@ -252,7 +235,7 @@ for i in range(1, MOCHITEST_TOTAL_CHUNKS + 1):
_test_flavors = {
'a11y': 'mochitest-a11y',
'browser-chrome': 'mochitest-browser',
'browser-chrome': 'mochitest-browser-chrome',
'chrome': 'mochitest-chrome',
'crashtest': 'crashtest',
'firefox-ui-functional': 'firefox-ui-functional',
@@ -267,10 +250,10 @@ _test_flavors = {
}
_test_subsuites = {
('browser-chrome', 'clipboard'): 'mochitest-browser-clipboard',
('browser-chrome', 'devtools'): 'mochitest-devtools',
('browser-chrome', 'gpu'): 'mochitest-browser-gpu',
('browser-chrome', 'screenshots'): 'mochitest-screenshots',
('browser-chrome', 'clipboard'): 'mochitest-browser-chrome-clipboard',
('browser-chrome', 'devtools'): 'mochitest-devtools-chrome',
('browser-chrome', 'gpu'): 'mochitest-browser-chrome-gpu',
('browser-chrome', 'screenshots'): 'mochitest-browser-chrome-screenshots',
('chrome', 'clipboard'): 'mochitest-chrome-clipboard',
('chrome', 'gpu'): 'mochitest-chrome-gpu',
('mochitest', 'clipboard'): 'mochitest-plain-clipboard',
@@ -300,20 +283,20 @@ def get_suite_definition(flavor, subsuite=None, strict=False):
"""
if not subsuite:
suite_name = _test_flavors.get(flavor)
return TEST_SUITES.get(suite_name, {}).copy()
return suite_name, TEST_SUITES.get(suite_name, {}).copy()
suite_name = _test_subsuites.get((flavor, subsuite))
if suite_name or strict:
return TEST_SUITES.get(suite_name, {}).copy()
return suite_name, TEST_SUITES.get(suite_name, {}).copy()
suite_name = _test_flavors.get(flavor)
if suite_name not in TEST_SUITES:
return {}
return suite_name, {}
suite = TEST_SUITES[suite_name].copy()
suite.setdefault('kwargs', {})
suite['kwargs']['subsuite'] = subsuite
return suite
return suite_name, suite
def rewrite_test_base(test, new_base, honor_install_to_subdir=False):

10
testing/mozbase/moztest/tests/test_resolve.py
View File

@@ -372,10 +372,10 @@ class TestTestResolver(Base):
r = self._get_resolver()
suites, tests = r.resolve_metadata(['bc'])
assert suites == {'mochitest-browser'}
assert suites == {'mochitest-browser-chrome'}
assert tests == []
suites, tests = r.resolve_metadata(['mochitest-a11y', 'browser', 'xpcshell'])
suites, tests = r.resolve_metadata(['mochitest-a11y', '/browser', 'xpcshell'])
assert suites == {'mochitest-a11y', 'xpcshell'}
assert sorted(t['file_relpath'] for t in tests) == [
'devtools/client/markupview/test/browser_markupview_copy_image_data.js',
@@ -387,14 +387,14 @@ class TestTestResolver(Base):
"""Test the task_regexes defined in TEST_SUITES."""
test_cases = {
'mochitest-browser': [
'mochitest-browser-chrome': [
'test-linux64/opt-mochitest-browser-chrome',
'test-linux64/opt-mochitest-browser-chrome-e10s',
],
'mochitest-chrome': [
'test-linux64/opt-mochitest-chrome',
],
'mochitest-devtools': [
'mochitest-devtools-chrome': [
'test-linux64/opt-mochitest-devtools-chrome',
],
'mochitest-media': [
@@ -410,7 +410,7 @@ class TestTestResolver(Base):
'test-linux64/opt-mochitest-gpu',
'test-linux64/opt-mochitest-gpu-e10s',
],
'mochitest-screenshots': [
'mochitest-browser-chrome-screenshots': [
'test-linux64/opt-browser-screenshots-1',
'test-linux64/opt-browser-screenshots-e10s-1',
],

2
testing/mozharness/configs/android/android_common.py
View File

@@ -58,7 +58,7 @@ config = {
# "screenshot_times": [60, 120, 180, 240],
"suite_definitions": {
"mochitest": {
"mochitest-plain": {
"run_filename": "runtestsremote.py",
"testsdir": "mochitest",
"options": [

34
testing/mozharness/configs/unittests/linux_unittest.py
View File

@@ -151,26 +151,26 @@ config = {
},
# local mochi suites
"all_mochitest_suites": {
"valgrind-plain": ["--valgrind=/usr/bin/valgrind",
"mochitest-valgrind-plain": ["--valgrind=/usr/bin/valgrind",
"--valgrind-supp-files=" + VALGRIND_SUPP_ARCH +
"," + VALGRIND_SUPP_CROSS_ARCH,
"--timeout=900", "--max-timeouts=50"],
"plain": [],
"plain-gpu": ["--subsuite=gpu"],
"plain-clipboard": ["--subsuite=clipboard"],
"plain-chunked": ["--chunk-by-dir=4"],
"plain-chunked-coverage": ["--chunk-by-dir=4", "--timeout=1200"],
"mochitest-plain": [],
"mochitest-plain-gpu": ["--subsuite=gpu"],
"mochitest-plain-clipboard": ["--subsuite=clipboard"],
"mochitest-plain-chunked": ["--chunk-by-dir=4"],
"mochitest-plain-chunked-coverage": ["--chunk-by-dir=4", "--timeout=1200"],
"mochitest-media": ["--subsuite=media"],
"chrome": ["--flavor=chrome"],
"chrome-gpu": ["--flavor=chrome", "--subsuite=gpu"],
"chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard"],
"chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
"browser-chrome": ["--flavor=browser"],
"browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
"browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
"browser-chrome-coverage": ["--flavor=browser", "--chunk-by-runtime", "--timeout=1200"],
"browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
"browser-chrome-instrumentation": ["--flavor=browser"],
"mochitest-chrome": ["--flavor=chrome"],
"mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu"],
"mochitest-chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard"],
"mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
"mochitest-browser-chrome": ["--flavor=browser"],
"mochitest-browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
"mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
"mochitest-browser-chrome-coverage": ["--flavor=browser", "--chunk-by-runtime", "--timeout=1200"],
"mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
"mochitest-browser-chrome-instrumentation": ["--flavor=browser"],
"mochitest-webgl1-core": ["--subsuite=webgl1-core"],
"mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
"mochitest-webgl2-core": ["--subsuite=webgl2-core"],
@@ -179,7 +179,7 @@ config = {
"mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"],
"mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
"mochitest-devtools-chrome-coverage": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime", "--timeout=1200"],
"a11y": ["--flavor=a11y"],
"mochitest-a11y": ["--flavor=a11y"],
},
# local reftest suites
"all_reftest_suites": {

30
testing/mozharness/configs/unittests/mac_unittest.py
View File

@@ -121,20 +121,20 @@ config = {
},
# local mochi suites
"all_mochitest_suites": {
"plain": [],
"plain-gpu": ["--subsuite=gpu"],
"plain-clipboard": ["--subsuite=clipboard"],
"plain-chunked": ["--chunk-by-dir=4"],
"mochitest-plain": [],
"mochitest-plain-gpu": ["--subsuite=gpu"],
"mochitest-plain-clipboard": ["--subsuite=clipboard"],
"mochitest-plain-chunked": ["--chunk-by-dir=4"],
"mochitest-media": ["--subsuite=media"],
"chrome": ["--flavor=chrome"],
"chrome-gpu": ["--flavor=chrome", "--subsuite=gpu"],
"chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard"],
"chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
"browser-chrome": ["--flavor=browser"],
"browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
"browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
"browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
"browser-chrome-instrumentation": ["--flavor=browser"],
"mochitest-chrome": ["--flavor=chrome"],
"mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu"],
"mochitest-chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard"],
"mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
"mochitest-browser-chrome": ["--flavor=browser"],
"mochitest-browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
"mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
"mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
"mochitest-browser-chrome-instrumentation": ["--flavor=browser"],
"mochitest-webgl1-core": ["--subsuite=webgl1-core"],
"mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
"mochitest-webgl2-core": ["--subsuite=webgl2-core"],
@@ -142,8 +142,8 @@ config = {
"mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
"mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"],
"mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
"mochitest-devtools-webreplay": ["--flavor=browser", "--subsuite=devtools-webreplay"],
"a11y": ["--flavor=a11y"],
"mochitest-devtools-chrome-webreplay": ["--flavor=browser", "--subsuite=devtools-webreplay"],
"mochitest-a11y": ["--flavor=a11y"],
},
# local reftest suites
"all_reftest_suites": {

28
testing/mozharness/configs/unittests/win_unittest.py
View File

@@ -144,20 +144,20 @@ config = {
# local mochi suites
"all_mochitest_suites":
{
"plain": [],
"plain-gpu": ["--subsuite=gpu"],
"plain-clipboard": ["--subsuite=clipboard"],
"plain-chunked": ["--chunk-by-dir=4"],
"mochitest-plain": [],
"mochitest-plain-gpu": ["--subsuite=gpu"],
"mochitest-plain-clipboard": ["--subsuite=clipboard"],
"mochitest-plain-chunked": ["--chunk-by-dir=4"],
"mochitest-media": ["--subsuite=media"],
"chrome": ["--flavor=chrome"],
"chrome-gpu": ["--flavor=chrome", "--subsuite=gpu"],
"chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard"],
"chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
"browser-chrome": ["--flavor=browser"],
"browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
"browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
"browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
"browser-chrome-instrumentation": ["--flavor=browser"],
"mochitest-chrome": ["--flavor=chrome"],
"mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu"],
"mochitest-chrome-clipboard": ["--flavor=chrome", "--subsuite=clipboard"],
"mochitest-chrome-chunked": ["--flavor=chrome", "--chunk-by-dir=4"],
"mochitest-browser-chrome": ["--flavor=browser"],
"mochitest-browser-chrome-clipboard": ["--flavor=browser", "--subsuite=clipboard"],
"mochitest-browser-chrome-chunked": ["--flavor=browser", "--chunk-by-runtime"],
"mochitest-browser-chrome-screenshots": ["--flavor=browser", "--subsuite=screenshots"],
"mochitest-browser-chrome-instrumentation": ["--flavor=browser"],
"mochitest-webgl1-core": ["--subsuite=webgl1-core"],
"mochitest-webgl1-ext": ["--subsuite=webgl1-ext"],
"mochitest-webgl2-core": ["--subsuite=webgl2-core"],
@@ -165,7 +165,7 @@ config = {
"mochitest-webgl2-deqp": ["--subsuite=webgl2-deqp"],
"mochitest-devtools-chrome": ["--flavor=browser", "--subsuite=devtools"],
"mochitest-devtools-chrome-chunked": ["--flavor=browser", "--subsuite=devtools", "--chunk-by-runtime"],
"a11y": ["--flavor=a11y"],
"mochitest-a11y": ["--flavor=a11y"],
},
# local reftest suites
"all_reftest_suites": {

2
testing/mozharness/mozharness/mozilla/testing/errors.py
View File

@@ -26,7 +26,6 @@ _mochitest_summary = {
}
TinderBoxPrintRe = {
"mochitest_summary": _mochitest_summary,
"mochitest-chrome_summary": _mochitest_summary,
"mochitest-webgl1-core_summary": _mochitest_summary,
"mochitest-webgl1-ext_summary": _mochitest_summary,
@@ -34,6 +33,7 @@ TinderBoxPrintRe = {
"mochitest-webgl2-ext_summary": _mochitest_summary,
"mochitest-webgl2-deqp_summary": _mochitest_summary,
"mochitest-media_summary": _mochitest_summary,
"mochitest-plain_summary": _mochitest_summary,
"mochitest-plain-clipboard_summary": _mochitest_summary,
"mochitest-plain-gpu_summary": _mochitest_summary,
"marionette_summary": {

34
testing/mozharness/mozharness/mozilla/testing/per_test_base.py
View File

@@ -44,11 +44,11 @@ class SingleTestMixin(FetchesMixin):
def _find_misc_tests(self, dirs, changed_files, gpu=False):
manifests = [
(os.path.join(dirs['abs_mochitest_dir'], 'tests', 'mochitest.ini'), 'plain'),
(os.path.join(dirs['abs_mochitest_dir'], 'chrome', 'chrome.ini'), 'chrome'),
(os.path.join(dirs['abs_mochitest_dir'], 'tests', 'mochitest.ini'), 'mochitest-plain'),
(os.path.join(dirs['abs_mochitest_dir'], 'chrome', 'chrome.ini'), 'mochitest-chrome'),
(os.path.join(dirs['abs_mochitest_dir'], 'browser',
'browser-chrome.ini'), 'browser-chrome'),
(os.path.join(dirs['abs_mochitest_dir'], 'a11y', 'a11y.ini'), 'a11y'),
'browser-chrome.ini'), 'mochitest-browser-chrome'),
(os.path.join(dirs['abs_mochitest_dir'], 'a11y', 'a11y.ini'), 'mochitest-a11y'),
(os.path.join(dirs['abs_xpcshell_dir'], 'tests', 'xpcshell.ini'), 'xpcshell'),
]
tests_by_path = {}
@@ -139,20 +139,20 @@ class SingleTestMixin(FetchesMixin):
# <suite> is associated with a manifest, explicitly in code above
# <subsuite> comes from "subsuite" tags in some manifest entries
# <full-suite> is a unique id for the suite, matching desktop mozharness configs
('browser-chrome', 'clipboard'): 'browser-chrome-clipboard',
('chrome', 'clipboard'): 'chrome-clipboard',
('plain', 'clipboard'): 'plain-clipboard',
('browser-chrome', 'devtools'): 'mochitest-devtools-chrome',
('browser-chrome', 'screenshots'): 'browser-chrome-screenshots',
('plain', 'media'): 'mochitest-media',
('mochitest-browser-chrome', 'clipboard'): 'mochitest-browser-chrome-clipboard',
('mochitest-chrome', 'clipboard'): 'mochitest-chrome-clipboard',
('mochitest-plain', 'clipboard'): 'mochitest-plain-clipboard',
('mochitest-browser-chrome', 'devtools'): 'mochitest-devtools-chrome',
('mochitest-browser-chrome', 'screenshots'): 'mochitest-browser-chrome-screenshots', # noqa
('mochitest-plain', 'media'): 'mochitest-media',
# below should be on test-verify-gpu job
('chrome', 'gpu'): 'chrome-gpu',
('plain', 'gpu'): 'plain-gpu',
('plain', 'webgl1-core'): 'mochitest-webgl1-core',
('plain', 'webgl1-ext'): 'mochitest-webgl1-ext',
('plain', 'webgl2-core'): 'mochitest-webgl2-core',
('plain', 'webgl2-ext'): 'mochitest-webgl2-ext',
('plain', 'webgl2-deqp'): 'mochitest-webgl2-deqp',
('mochitest-chrome', 'gpu'): 'mochitest-chrome-gpu',
('mochitest-plain', 'gpu'): 'mochitest-plain-gpu',
('mochitest-plain', 'webgl1-core'): 'mochitest-webgl1-core',
('mochitest-plain', 'webgl1-ext'): 'mochitest-webgl1-ext',
('mochitest-plain', 'webgl2-core'): 'mochitest-webgl2-core',
('mochitest-plain', 'webgl2-ext'): 'mochitest-webgl2-ext',
('mochitest-plain', 'webgl2-deqp'): 'mochitest-webgl2-deqp',
}
if entry in subsuite_mapping:
suite = subsuite_mapping[entry]

1
testing/mozharness/mozharness/mozilla/testing/testbase.py
View File

@@ -314,6 +314,7 @@ You can set this by specifying --test-url URL
'robocop': 'mochitest',
'mochitest-chrome': 'mochitest',
'mochitest-media': 'mochitest',
'mochitest-plain': 'mochitest',
'mochitest-plain-clipboard': 'mochitest',
'mochitest-plain-gpu': 'mochitest',
'mochitest-webgl1-core': 'mochitest',

16
testing/mozharness/scripts/android_emulator_unittest.py
View File

@@ -9,7 +9,6 @@ import copy
import datetime
import json
import os
import re
import sys
import subprocess
@@ -136,13 +135,6 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi
self.test_suite = c.get('test_suite')
self.this_chunk = c.get('this_chunk')
self.total_chunks = c.get('total_chunks')
if self.test_suite and self.test_suite not in self.config["suite_definitions"]:
# accept old-style test suite name like "mochitest-3"
m = re.match("(.*)-(\d*)", self.test_suite)
if m:
self.test_suite = m.group(1)
if self.this_chunk is None:
self.this_chunk = m.group(2)
self.xre_path = None
self.device_serial = 'emulator-5554'
self.log_raw_level = c.get('log_raw_level')
@@ -320,11 +312,11 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi
# For each test category, provide a list of supported sub-suites and a mapping
# between the per_test_base suite name and the android suite name.
all = [('mochitest', {'plain': 'mochitest',
'chrome': 'mochitest-chrome',
all = [('mochitest', {'mochitest-plain': 'mochitest-plain',
'mochitest-chrome': 'mochitest-chrome',
'mochitest-media': 'mochitest-media',
'plain-clipboard': 'mochitest-plain-clipboard',
'plain-gpu': 'mochitest-plain-gpu'}),
'mochitest-plain-clipboard': 'mochitest-plain-clipboard',
'mochitest-plain-gpu': 'mochitest-plain-gpu'}),
('reftest', {'reftest': 'reftest',
'crashtest': 'crashtest',
'jsreftest': 'jsreftest'}),

16
testing/mozharness/scripts/android_hardware_unittest.py
View File

@@ -9,7 +9,6 @@ import copy
import datetime
import json
import os
import re
import sys
import subprocess
@@ -112,13 +111,6 @@ class AndroidHardwareTest(TestingMixin, BaseScript, MozbaseMixin,
self.test_suite = c.get('test_suite')
self.this_chunk = c.get('this_chunk')
self.total_chunks = c.get('total_chunks')
if self.test_suite and self.test_suite not in self.config["suite_definitions"]:
# accept old-style test suite name like "mochitest-3"
m = re.match("(.*)-(\d*)", self.test_suite)
if m:
self.test_suite = m.group(1)
if self.this_chunk is None:
self.this_chunk = m.group(2)
self.xre_path = None
self.log_raw_level = c.get('log_raw_level')
self.log_tbpl_level = c.get('log_tbpl_level')
@@ -266,10 +258,10 @@ class AndroidHardwareTest(TestingMixin, BaseScript, MozbaseMixin,
if self.test_suite:
return [(self.test_suite, self.test_suite)]
# per-test mode: determine test suites to run
all = [('mochitest', {'plain': 'mochitest',
'chrome': 'mochitest-chrome',
'plain-clipboard': 'mochitest-plain-clipboard',
'plain-gpu': 'mochitest-plain-gpu'}),
all = [('mochitest', {'mochitest-plain': 'mochitest-plain',
'mochitest-chrome': 'mochitest-chrome',
'mochitest-plain-clipboard': 'mochitest-plain-clipboard',
'mochitest-plain-gpu': 'mochitest-plain-gpu'}),
('reftest', {'reftest': 'reftest', 'crashtest': 'crashtest'}),
('xpcshell', {'xpcshell': 'xpcshell'})]
suites = []

14
tools/tryselect/tasks.py
View File

@@ -105,7 +105,7 @@ def filter_tasks_by_paths(tasks, paths):
task_regexes = set()
for flavor, subsuite in flavors:
suite = get_suite_definition(flavor, subsuite, strict=True)
_, suite = get_suite_definition(flavor, subsuite, strict=True)
if 'task_regex' not in suite:
print("warning: no tasks could be resolved from flavor '{}'{}".format(
flavor, " and subsuite '{}'".format(subsuite) if subsuite else ""))
@@ -125,17 +125,7 @@ def resolve_tests_by_suite(paths):
suite_to_tests = defaultdict(list)
for test in run_tests:
suite = get_suite_definition(test['flavor'], test.get('subsuite'), strict=True)
if 'mozharness_name' in suite:
key = suite['mozharness_name']
else:
key = test['flavor']
subsuite = test.get('subsuite')
if subsuite:
key += '-' + subsuite
key, _ = get_suite_definition(test['flavor'], test.get('subsuite'), strict=True)
suite_to_tests[key].append(test['srcdir_relpath'])
return suite_to_tests

11
tools/tryselect/test/test_mozharness_integration.py
View File

@@ -25,11 +25,6 @@ MOZHARNESS_SCRIPTS = {
'geckoview-junit',
'jittest',
'jsreftest',
'mochitest',
'mochitest-chrome',
'mochitest-plain-clipboard',
'mochitest-plain-gpu',
'robocop',
],
},
'desktop_unittest': {
@@ -40,7 +35,6 @@ MOZHARNESS_SCRIPTS = {
'unittests/win_unittest.py',
],
'xfail': [
'browser-chrome-instrumentation',
'cppunittest',
'gtest',
'jittest',
@@ -48,11 +42,12 @@ MOZHARNESS_SCRIPTS = {
'jittest1',
'jittest2',
'jsreftest',
'mochitest-devtools-webreplay',
'mochitest-browser-chrome-instrumentation',
'mochitest-devtools-chrome-webreplay',
'mochitest-valgrind-plain',
'reftest-gpu',
'reftest-no-accel',
'reftest-qr',
'valgrind-plain',
],
},
}

2
tools/tryselect/test/test_tasks.py
View File

@@ -31,7 +31,7 @@ def test_resolve_tests_by_suite(patch_resolver):
])
assert resolve_tests_by_suite(['xpcshell.js', 'mochitest.js']) == {
'xpcshell': ['xpcshell.js'],
'plain': ['mochitest.js'],
'mochitest-plain': ['mochitest.js'],
}