Bug 1799131 - Adjust test-info manifests to retain ancestor. r=gbrown,asuth

Differential Revision: https://phabricator.services.mozilla.com/D161271

Author: jmaher

testing/testinfo.py

@@ -484,8 +484,11 @@ def matches_filters(test):
 
         manifest_paths = set()
         for t in tests:
-            if "manifest" in t and t["manifest"] is not None:
-                manifest_paths.add(t["manifest"])
+            if t.get("manifest", None):
+                manifest_path = t["manifest"]
+                if t.get("ancestor_manifest", None):
+                    manifest_path = "%s:%s" % (t["ancestor_manifest"], t["manifest"])
+                manifest_paths.add(manifest_path)
         manifest_count = len(manifest_paths)
         print(
             "Resolver found {} tests, {} manifests".format(len(tests), manifest_count)
@@ -637,6 +640,13 @@ def matches_filters(test):
                             else:
                                 test_info["manifest"] = [t["manifest_relpath"]]
 
+                            # handle included manifests as ancestor:child
+                            if t.get("ancestor_manifest", None):
+                                test_info["manifest"] = [
+                                    "%s:%s"
+                                    % (t["ancestor_manifest"], test_info["manifest"][0])
+                                ]
+
                         if show_tests:
                             rkey = key if show_components else "all"
                             if rkey in by_component["tests"]:
@@ -656,9 +666,15 @@ def matches_filters(test):
                                                 test_info["manifest"][0]
                                                 not in ti["manifest"]
                                             ):
-                                                ti["manifest"].extend(
-                                                    test_info["manifest"]
-                                                )
+                                                ti_manifest = test_info["manifest"]
+                                                if test_info.get(
+                                                    "ancestor_manifest", None
+                                                ):
+                                                    ti_manifest = "%s:%s" % (
+                                                        test_info["ancestor_manifest"],
+                                                        ti_manifest,
+                                                    )
+                                                ti["manifest"].extend(ti_manifest)
                             else:
                                 by_component["tests"][rkey] = [test_info]
             if show_tests: