Bug 1872783 - s/browser-chrome-screenshots/browser-screenshots/ r=aryx

Differential Revision: https://phabricator.services.mozilla.com/D197712
This commit is contained in:
Joel Maher 2024-01-04 21:58:00 +00:00
parent 3b5321dfd1
commit 1e7e0a10f2
11 changed files with 18 additions and 19 deletions

View file

@ -375,10 +375,10 @@ mochitest-browser-media:
allow-software-gl-layers: false
virtualization: virtual
browser-screenshots:
mochitest-browser-screenshots:
description: "Browser Screenshots"
suite:
name: mochitest-browser-chrome-screenshots
name: mochitest-browser-screenshots
treeherder-symbol: M(ss)
loopback-video: true
test-manifest-loader: null # don't load tests in the taskgraph

View file

@ -136,7 +136,7 @@ mochitest-valgrind:
- mochitest-valgrind
desktop-screenshot-capture:
- browser-screenshots
- mochitest-browser-screenshots
### Specific platform test sets

View file

@ -59,7 +59,7 @@ def run_test(context, is_junit, **kwargs):
"mochitest-chrome-gpu": "gpu",
"mochitest-plain-gpu": "gpu",
"mochitest-media": "media",
"mochitest-browser-chrome-screenshots": "screenshots",
"mochitest-browser-screenshots": "screenshots",
"mochitest-webgl1-core": "webgl1-core",
"mochitest-webgl1-ext": "webgl1-ext",
"mochitest-webgl2-core": "webgl2-core",

View file

@ -100,7 +100,7 @@ TEST_SUITES = {
"test-verify($|.*(-1|[^0-9])$)",
],
},
"mochitest-browser-chrome-screenshots": {
"mochitest-browser-screenshots": {
"aliases": ("ss", "screenshots-chrome"),
"build_flavor": "browser-chrome",
"mach_command": "mochitest",
@ -109,7 +109,7 @@ TEST_SUITES = {
"subsuite": "screenshots",
"test_paths": None,
},
"task_regex": ["browser-screenshots($|.*(-1|[^0-9])$)"],
"task_regex": ["mochitest-browser-screenshots($|.*(-1|[^0-9])$)"],
},
"mochitest-chrome": {
"aliases": ("mc",),
@ -405,7 +405,7 @@ _test_subsuites = {
("browser-chrome", "devtools"): "mochitest-devtools-chrome",
("browser-chrome", "media"): "mochitest-browser-media",
("browser-chrome", "remote"): "mochitest-remote",
("browser-chrome", "screenshots"): "mochitest-browser-chrome-screenshots",
("browser-chrome", "screenshots"): "mochitest-browser-screenshots",
("chrome", "gpu"): "mochitest-chrome-gpu",
("mochitest", "gpu"): "mochitest-plain-gpu",
("mochitest", "media"): "mochitest-media",

View file

@ -473,8 +473,6 @@ def test_ancestor_manifest_defaults(resolver, topsrcdir, defaults):
def test_task_regexes():
"""Test the task_regexes defined in TEST_SUITES."""
task_labels = [
"test-linux64/opt-browser-screenshots-1",
"test-linux64/opt-browser-screenshots-e10s-1",
"test-linux64/opt-marionette",
"test-linux64/opt-mochitest-plain",
"test-linux64/debug-mochitest-plain-e10s",
@ -490,7 +488,8 @@ def test_task_regexes():
"test-linux64/opt-mochitest-gpu-e10s",
"test-linux64/opt-mochitest-media-e10s-1",
"test-linux64/opt-mochitest-media-e10s-11",
"test-linux64/opt-mochitest-screenshots-1",
"test-linux64/opt-mochitest-browser-screenshots-1",
"test-linux64/opt-mochitest-browser-screenshots-e10s-1",
"test-linux64/opt-reftest",
"test-linux64/opt-geckoview-reftest",
"test-linux64/debug-reftest-e10s-1",
@ -532,9 +531,9 @@ def test_task_regexes():
"test-linux64/opt-mochitest-gpu",
"test-linux64/opt-mochitest-gpu-e10s",
],
"mochitest-browser-chrome-screenshots": [
"test-linux64/opt-browser-screenshots-1",
"test-linux64/opt-browser-screenshots-e10s-1",
"mochitest-browser-screenshots": [
"test-linux64/opt-mochitest-browser-screenshots-1",
"test-linux64/opt-mochitest-browser-screenshots-e10s-1",
],
"reftest": [
"test-linux64/opt-reftest",

View file

@ -161,7 +161,7 @@ config = {
"--chunk-by-runtime",
"--timeout=1200",
],
"mochitest-browser-chrome-screenshots": [
"mochitest-browser-screenshots": [
"--flavor=browser",
"--subsuite=screenshots",
],

View file

@ -124,7 +124,7 @@ config = {
"mochitest-chrome": ["--flavor=chrome", "--chunk-by-dir=4", "--disable-e10s"],
"mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu", "--disable-e10s"],
"mochitest-browser-chrome": ["--flavor=browser", "--chunk-by-runtime"],
"mochitest-browser-chrome-screenshots": [
"mochitest-browser-screenshots": [
"--flavor=browser",
"--subsuite=screenshots",
],

View file

@ -150,7 +150,7 @@ config = {
"mochitest-chrome": ["--flavor=chrome", "--chunk-by-dir=4", "--disable-e10s"],
"mochitest-chrome-gpu": ["--flavor=chrome", "--subsuite=gpu", "--disable-e10s"],
"mochitest-browser-chrome": ["--flavor=browser", "--chunk-by-runtime"],
"mochitest-browser-chrome-screenshots": [
"mochitest-browser-screenshots": [
"--flavor=browser",
"--subsuite=screenshots",
],

View file

@ -236,7 +236,7 @@ class SingleTestMixin(object):
"mochitest-browser-chrome",
"screenshots",
None,
): "mochitest-browser-chrome-screenshots", # noqa
): "mochitest-browser-screenshots", # noqa
("mochitest-plain", "media", None): "mochitest-media",
# below should be on test-verify-gpu job
("mochitest-chrome", "gpu", None): "mochitest-chrome-gpu",

View file

@ -299,7 +299,7 @@
"uriloader/exthandler/tests/mochitest/browser.ini": 25.41,
"widget/tests/browser/browser.ini": 16.15
},
"mochitest-browser-chrome-screenshots": {
"mochitest-browser-screenshots": {
"browser/tools/mozscreenshots/controlCenter/browser.ini": 144.09,
"browser/tools/mozscreenshots/devtools/browser.ini": 25.54,
"browser/tools/mozscreenshots/permissionPrompts/browser.ini": 67.87,

View file

@ -300,7 +300,7 @@
"uriloader/exthandler/tests/mochitest/browser.ini": 20.44,
"widget/tests/browser/browser.ini": 18.18
},
"mochitest-browser-chrome-screenshots": {
"mochitest-browser-screenshots": {
"browser/tools/mozscreenshots/controlCenter/browser.ini": 67.17,
"browser/tools/mozscreenshots/devtools/browser.ini": 12.01,
"browser/tools/mozscreenshots/permissionPrompts/browser.ini": 32.27,