Bug 1482413 - More mozharness logging updates for test-verify; r=me,a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Fri, 17 Aug 2018 09:21:33 -0600
changeset 432131 a71e4a20a0a63fb1e996cd7a15fff11cad5fd86c
parent 432130 04521101cd23130ce485dd3f2009666acd35dcf7
child 432132 48eed9811f275b8e4c255c4fa74ff1237a49824d
push id106645
push usergbrown@mozilla.com
push dateFri, 17 Aug 2018 15:21:47 +0000
treeherdermozilla-inbound@a71e4a20a0a6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, test-only
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1482413 - More mozharness logging updates for test-verify; r=me,a=test-only
--- a/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
+++ b/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
@@ -115,17 +115,17 @@ class SingleTestMixin(object):
             if gpu and not self._is_gpu_suite(entry[1]):
                 self.info("Per-test run (gpu) discarded non-gpu test %s (%s)" % (file, entry[1]))
             elif not gpu and self._is_gpu_suite(entry[1]):
                 self.info("Per-test run (non-gpu) discarded gpu test %s (%s)" % (file, entry[1]))
-            self.info("Per-test run found test %s (%s)" % (file, entry[0]))
+            self.info("Per-test run found test %s (%s/%s)" % (file, entry[0], entry[1]))
             subsuite_mapping = {
                 # Map (<suite>, <subsuite>): <full-suite>
                 #   <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',
@@ -160,16 +160,17 @@ class SingleTestMixin(object):
         # paths correctly.
         paths_file = os.path.join(dirs['abs_wpttest_dir'],
                                   "tests", "tools", "localpaths.py")
         execfile(paths_file, {"__file__": paths_file})
         import manifest as wptmanifest
         tests_root = os.path.join(dirs['abs_wpttest_dir'], "tests")
         man_path = os.path.join(dirs['abs_wpttest_dir'], "meta", "MANIFEST.json")
         man = wptmanifest.manifest.load(tests_root, man_path)
+        self.info("Per-test run updated with manifest %s" % man_path)
         repo_tests_path = os.path.join("testing", "web-platform", "tests")
         tests_path = os.path.join("tests", "web-platform", "tests")
         for (type, path, test) in man:
             if type not in ["testharness", "reftest", "wdspec"]:
             repo_path = os.path.join(repo_tests_path, path)
             # manifest paths use os.sep (like backslash on Windows) but
@@ -329,19 +330,21 @@ class SingleTestMixin(object):
            In per-test mode, determine which suites are active, for the given
            suite category.
         suites = None
         if self.verify_enabled or self.per_test_coverage:
             if self.config.get('per_test_category') == "web-platform":
                 suites = self.suites.keys()
+                self.info("Per-test suites: %s" % suites)
             elif all_suites and self.tests_downloaded:
                 suites = dict((key, all_suites.get(key)) for key in
                               self.suites if key in all_suites.keys())
+                self.info("Per-test suites: %s" % suites)
                 # Until test zips are downloaded, manifests are not available,
                 # so it is not possible to determine which suites are active/
                 # required for per-test mode; assume all suites from supported
                 # suite categories are required.
                 if category in ['mochitest', 'xpcshell', 'reftest']:
                     suites = all_suites
         return suites