From 5d91672933eee5e4b4fc4176f7a0cf8d9ee50c24 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Wed, 27 Mar 2019 15:59:55 +0000
Subject: [PATCH] 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

--HG--
extra : moz-landing-system : lando
---
 testing/mozharness/scripts/desktop_unittest.py      | 6 ++++++
 tools/tryselect/test/test_mozharness_integration.py | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py
index c87484901951..798a61e4e4d4 100755
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -364,6 +364,12 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin,
     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
 
diff --git a/tools/tryselect/test/test_mozharness_integration.py b/tools/tryselect/test/test_mozharness_integration.py
index 45424c57d317..e67b6e2aa4d4 100644
--- a/tools/tryselect/test/test_mozharness_integration.py
+++ b/tools/tryselect/test/test_mozharness_integration.py
@@ -39,10 +39,7 @@ def all_suites(patch_resolver):
 
 KNOWN_FAILURES = (
     'browser-chrome-addons',
-    'browser-chrome-chunked',
-    'browser-chrome-coverage',
     'browser-chrome-instrumentation',
-    'chrome-chunked',
     'cppunittest',
     'gtest',
     'jittest',
@@ -61,7 +58,6 @@ KNOWN_FAILURES = (
     '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.