nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1860616 - add support for MOZHARNESS_CONFIRM_PATHS to mozharness scripts. r=gbrown,taskgraph-reviewers,releng-reviewers,ahal

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D191672
This commit is contained in:
Joel Maher 2023-10-31 19:59:53 +00:00
parent 5e6062194f
commit 21a9199123
6 changed files with 62 additions and 14 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
taskcluster/gecko_taskgraph/actions/confirm_failure.py
View file

@ -234,6 +234,8 @@ def confirm_failures(parameters, graph_config, input, task_group_id, task_id):
suite = task_definition["extra"]["suite"]
if "-coverage" in suite:
suite = suite[: suite.index("-coverage")]
if "-qr" in suite:
suite = suite[: suite.index("-qr")]
failures = get_failures(task_id, task_definition)
if failures["dirs"] == [] and failures["tests"] == []:

25
testing/mozharness/scripts/android_emulator_unittest.py
View file

@ -241,11 +241,24 @@ class AndroidEmulatorTest(
return os.path.join(dirs["abs_test_install_dir"], test_dir)
def _get_mozharness_test_paths(self, suite):
test_paths = os.environ.get("MOZHARNESS_TEST_PATHS")
if not test_paths:
return
test_paths = json.loads(os.environ.get("MOZHARNESS_TEST_PATHS", '""'))
confirm_paths = json.loads(os.environ.get("MOZHARNESS_CONFIRM_PATHS", '""'))
return json.loads(test_paths).get(suite)
if not test_paths or not test_paths.get(suite, []):
return None
suite_test_paths = test_paths.get(suite, [])
if confirm_paths and confirm_paths.get(suite, []):
suite_test_paths = confirm_paths.get(suite, [])
if suite in ("reftest", "crashtest"):
dirs = self.query_abs_dirs()
suite_test_paths = [
os.path.join(dirs["abs_reftest_dir"], "tests", p)
for p in suite_test_paths
]
return suite_test_paths
def _build_command(self):
c = self.config
@ -335,7 +348,7 @@ class AndroidEmulatorTest(
if not (self.verify_enabled or self.per_test_coverage):
if user_paths:
cmd.extend(user_paths)
elif not (self.verify_enabled or self.per_test_coverage):
else:
if self.this_chunk is not None:
cmd.extend(["--this-chunk", self.this_chunk])
if self.total_chunks is not None:
@ -352,7 +365,7 @@ class AndroidEmulatorTest(
try_options, try_tests = self.try_args(self.test_suite)
cmd.extend(try_options)
if not self.verify_enabled and not self.per_test_coverage:
if not self.verify_enabled and not self.per_test_coverage and not user_paths:
cmd.extend(
self.query_tests_args(
self.config["suite_definitions"][self.test_suite].get("tests"),

27
testing/mozharness/scripts/android_hardware_unittest.py
View file

@ -247,6 +247,7 @@ class AndroidHardwareTest(
}
user_paths = json.loads(os.environ.get("MOZHARNESS_TEST_PATHS", '""'))
confirm_paths = json.loads(os.environ.get("MOZHARNESS_CONFIRM_PATHS", '""'))
for option in self.config["suite_definitions"][self.test_suite]["options"]:
opt = option.split("=")[0]
@ -266,10 +267,7 @@ class AndroidHardwareTest(
if option:
cmd.extend([option])
if user_paths:
if self.test_suite in user_paths:
cmd.extend(user_paths[self.test_suite])
elif not self.verify_enabled:
if not self.verify_enabled and not user_paths:
if self.this_chunk is not None:
cmd.extend(["--this-chunk", self.this_chunk])
if self.total_chunks is not None:
@ -299,8 +297,25 @@ class AndroidHardwareTest(
cmd.extend(["--setpref={}".format(p) for p in self.extra_prefs])
try_options, try_tests = self.try_args(self.test_suite)
cmd.extend(try_options)
if not self.verify_enabled and not self.per_test_coverage:
if try_options:
cmd.extend(try_options)
if user_paths:
# reftest on android-hw uses a subset (reftest-qr) of tests,
# but scheduling only knows about 'reftest'
suite = self.test_suite
if suite == "reftest-qr":
suite = "reftest"
if user_paths.get(suite, []):
suite_test_paths = user_paths.get(suite, [])
# NOTE: we do not want to prepend 'tests' if a single path
if confirm_paths and confirm_paths.get(suite, []):
suite_test_paths = confirm_paths.get(suite, [])
suite_test_paths = [os.path.join("tests", p) for p in suite_test_paths]
cmd.extend(suite_test_paths)
elif not self.verify_enabled and not self.per_test_coverage:
cmd.extend(
self.query_tests_args(
self.config["suite_definitions"][self.test_suite].get("tests"),

5
testing/mozharness/scripts/desktop_unittest.py
View file

@ -586,7 +586,10 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
return self.symbols_url
def _get_mozharness_test_paths(self, suite_category, suite):
# test_paths is the group name, confirm_paths can be the path+testname
# test_paths will always be the group name, unrelated to if confirm_paths is set or not.
test_paths = json.loads(os.environ.get("MOZHARNESS_TEST_PATHS", '""'))
confirm_paths = json.loads(os.environ.get("MOZHARNESS_CONFIRM_PATHS", '""'))
if "-coverage" in suite:
suite = suite[: suite.index("-coverage")]
@ -595,6 +598,8 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
return None
suite_test_paths = test_paths[suite]
if confirm_paths and suite in confirm_paths and confirm_paths[suite]:
suite_test_paths = confirm_paths[suite]
if suite_category == "reftest":
dirs = self.query_abs_dirs()

10
testing/mozharness/scripts/marionette.py
View file

@ -355,11 +355,17 @@ class MarionetteTest(TestingMixin, MercurialScript, TransferMixin, CodeCoverageM
self.fatal("Could not create blobber upload directory")
test_paths = json.loads(os.environ.get("MOZHARNESS_TEST_PATHS", '""'))
confirm_paths = json.loads(os.environ.get("MOZHARNESS_CONFIRM_PATHS", '""'))
suite = "marionette"
if test_paths and suite in test_paths:
suite_test_paths = test_paths[suite]
if confirm_paths and suite in confirm_paths and confirm_paths[suite]:
suite_test_paths = confirm_paths[suite]
if test_paths and "marionette" in test_paths:
paths = [
os.path.join(dirs["abs_test_install_dir"], "marionette", "tests", p)
for p in test_paths["marionette"]
for p in suite_test_paths
]
cmd.extend(paths)
else:

7
testing/mozharness/scripts/web_platform_tests.py
View file

@ -446,10 +446,17 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
test_paths = set()
if not (self.verify_enabled or self.per_test_coverage):
# mozharness_test_paths is a set of test groups (directories) to run
# if we have confirm_paths, this is a specific path we want to run and ignore the group
mozharness_test_paths = json.loads(
os.environ.get("MOZHARNESS_TEST_PATHS", '""')
)
confirm_paths = json.loads(os.environ.get("MOZHARNESS_CONFIRM_PATHS", '""'))
if mozharness_test_paths:
if confirm_paths:
mozharness_test_paths = confirm_paths
path = os.path.join(dirs["abs_fetches_dir"], "wpt_tests_by_group.json")
if not os.path.exists(path):