Bug 1523303 - [mozharness] Normalize '-chunked' out of suite name when reading MOZHARNESS_TEST_PATHS in desktop_unittest.py, r=gbrown
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 27 Mar 2019 15:59:55 +0000
changeset 466389 06b200ff82e61d99e47d7fbff55262dff8491c6c
parent 466388 ac9662d71fec689129fb315a9aac1f8a6166bbd4
child 466390 fb7fb6f72fb1a0b907e1d25f59026fe1c7cfdf16
push id35768
push useropoprus@mozilla.com
push dateThu, 28 Mar 2019 09:55:54 +0000
treeherdermozilla-central@c045dd97faf2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs1523303
milestone68.0a1
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 1523303 - [mozharness] Normalize '-chunked' out of suite name when reading MOZHARNESS_TEST_PATHS in desktop_unittest.py, r=gbrown Mozharness appends -chunked/-coverage to some suites, but the build system/test resolver don't have any concept of these things. We need to normalize these out for the purposes of MOZHARNESS_TEST_PATHS. Differential Revision: https://phabricator.services.mozilla.com/D25015
testing/mozharness/scripts/desktop_unittest.py
tools/tryselect/test/test_mozharness_integration.py
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -359,16 +359,22 @@ class DesktopUnittest(TestingMixin, Merc
             self.fatal("self.installer_url was not found in self.config")
         self.info("setting symbols_url as %s" % (symbols_url))
         self.symbols_url = symbols_url
         return self.symbols_url
 
     def _get_mozharness_test_paths(self, suite_category, suite):
         test_paths = json.loads(os.environ.get('MOZHARNESS_TEST_PATHS', '""'))
 
+        if '-chunked' in suite:
+            suite = suite[:suite.index('-chunked')]
+
+        if '-coverage' in suite:
+            suite = suite[:suite.index('-coverage')]
+
         if not test_paths or suite not in test_paths:
             return None
 
         suite_test_paths = test_paths[suite]
 
         if suite_category == 'reftest':
             dirs = self.query_abs_dirs()
             suite_test_paths = [os.path.join(dirs['abs_reftest_dir'], 'tests', p)
--- a/tools/tryselect/test/test_mozharness_integration.py
+++ b/tools/tryselect/test/test_mozharness_integration.py
@@ -34,20 +34,17 @@ def all_suites(patch_resolver):
         all_suites.append({'flavor': flavor, 'subsuite': subsuite, 'srcdir_relpath': 'test'})
 
     patch_resolver([], all_suites)
     return resolve_tests_by_suite(['test'])
 
 
 KNOWN_FAILURES = (
     'browser-chrome-addons',
-    'browser-chrome-chunked',
-    'browser-chrome-coverage',
     'browser-chrome-instrumentation',
-    'chrome-chunked',
     'cppunittest',
     'gtest',
     'jittest',
     'jittest-chunked',
     'jittest1',
     'jittest2',
     'jsreftest',
     'reftest-no-accel',
@@ -56,17 +53,16 @@ KNOWN_FAILURES = (
     'mochitest-devtools-chrome-coverage',
     'plain',
     'plain-chunked',
     'plain-chunked-coverage',
     'plain-clipboard',
     'plain-gpu',
     'valgrind-plain',
     'xpcshell-addons',
-    'xpcshell-coverage',
 )
 """A suite being listed here means it won't work properly with
 MOZHARNESS_TEST_PATHS (the mechanism |mach try fuzzy <path>| uses.
 """
 
 
 def generate_mozharness_suite_names():
     configdir = os.path.join(build.topsrcdir, 'testing', 'mozharness', 'configs', 'unittests')