tor-browser

commit d8c6e543ac94a765432f27f0ab91a3244daa151b
parent c99c2717306a9444dbee2a0f47875d9159c8709e
Author: Atila Butkovits <abutkovits@mozilla.com>
Date:   Wed,  3 Dec 2025 21:29:08 +0200

Revert "Bug 2003239, Bug 2003240 - Remove unused cruft of DefaultLoader.get_manifests r=jcristau,taskgraph-reviewers" for causing failures at test_testmanifest.py.

This reverts commit 255ab1a99418ac5519870f20001206bf2ed053ad.

Revert "Bug 2003240 - Optimize skip-if to avoid redundant dictionary lookup r=jcristau"

This reverts commit cd3318ee495f22b8b89a1328da1bbec34230098b.

Diffstat:
M
taskcluster/gecko_taskgraph/util/chunking.py
 | 
19
++++++++++++++-----
M
testing/mozbase/manifestparser/manifestparser/filters.py
 | 
8
++++----

2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/taskcluster/gecko_taskgraph/util/chunking.py b/taskcluster/gecko_taskgraph/util/chunking.py
@@ -308,13 +308,22 @@ class DefaultLoader(BaseManifestLoader):
             disabled=False, exists=False, filters=filters, **mozinfo
         )
 
-        active_manifests = {chunk_by_runtime.get_manifest(t) for t in active_tests}
+        all_manifests = {chunk_by_runtime.get_manifest(t) for t in tests}
+
+        active = {}
+        for t in active_tests:
+            mp = chunk_by_runtime.get_manifest(t)
+            dir_relpath = t["dir_relpath"]
+            if not mp.startswith(dir_relpath):
+                active.setdefault(mp, set()).add(dir_relpath)
+            else:
+                active.setdefault(mp, set())
+
+        skipped = all_manifests - set(active.keys())
 
-        skipped_manifests = {chunk_by_runtime.get_manifest(t) for t in tests}
-        skipped_manifests.difference_update(active_manifests)
         return {
-            "active": list(active_manifests),
-            "skipped": list(skipped_manifests),
+            "active": list(active.keys()),
+            "skipped": list(skipped),
             "other_dirs": {},
         }
 
diff --git a/testing/mozbase/manifestparser/manifestparser/filters.py b/testing/mozbase/manifestparser/manifestparser/filters.py
@@ -33,12 +33,12 @@ def skip_if(tests, values, strict=False):
     Sets disabled on all tests containing the `skip-if` tag and whose condition
     is True. This filter is added by default.
     """
+    tag = "skip-if"
     for test in tests:
-        test_tag = test.get("skip_if")
-        if test_tag:
-            matching_expr = _match(test_tag, strict, **values)
+        if tag in test:
+            matching_expr = _match(test[tag], strict, **values)
             if matching_expr:
-                test.setdefault("disabled", f"skip_if: {matching_expr}")
+                test.setdefault("disabled", f"{tag}: {matching_expr}")
         yield test