Bug 1609508 - Adjust test-info report queries; r=jmaher

Minor changes to test-info report's interaction with ActiveData:
 - with improved reftest data in ActiveData, several path modifications can
be removed;
 - adjust some crashtest query data ranges to more efficiently handle the
new data;
 - add a missing path modification for xpcshell, to handle test names that
include manifests.

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

--HG--
extra : moz-landing-system : lando

Author: gbrownmozilla

testing/testinfo.py

@@ -663,17 +663,11 @@ def path_mod_reftest(self, path):
         path = path.split('?')[0]
         # "<path>#<fragment>" -> "<path>"
         path = path.split('#')[0]
-        # "chrome://reftest/content/<path>" -> "layout/reftests/<path>"
-        path = path.replace('chrome://reftest/content', 'layout/reftests')
         return path
 
     def path_mod_jsreftest(self, path):
-        # "<path-to>/jsreftest.html?test=<path>" -> "<path>"
-        path = path.split('=')[1]
         # "<path>;assert" -> "<path>"
         path = path.split(';')[0]
-        # "<rel-path>" -> "js/src/tests/<path>"
-        path = os.path.join('js', 'src', 'tests', path)
         return path
 
     def path_mod_marionette(self, path):
@@ -683,16 +677,6 @@ def path_mod_marionette(self, path):
         path = path.replace('\\', os.path.sep)
         return path
 
-    def path_mod_crashtest(self, path):
-        # TODO: revisit the need for these transforms after bug 1596567
-        # "chrome://reftest/content/crashtests/<path>" -> "<path>"
-        path = path.replace('chrome://reftest/content/crashtests/', '')
-        # "file://<path2>/reftests/tests/<path>" -> "<path>"
-        path = re.sub(r'file://.*/reftest/tests/', '', path)
-        # "http://<ip>/tests/<path>" -> "<path>"
-        path = re.sub(r'http://\d*\.\d*\.\d*\.\d*:\d*/tests/', '', path)
-        return path
-
     def path_mod_wpt(self, path):
         if path[0] == os.path.sep:
             # "/<path>" -> "<path>"
@@ -709,6 +693,11 @@ def path_mod_jittest(self, path):
         # "<path>" -> "js/src/jit-test/tests/<path>"
         return os.path.join('js', 'src', 'jit-test', 'tests', path)
 
+    def path_mod_xpcshell(self, path):
+        # <manifest>.ini:<path> -> "<path>"
+        path = path.split('.ini:')[-1]
+        return path
+
     def add_activedata(self, branches, days, by_component):
         suites = {
             # List of known suites requiring special path handling and/or
@@ -726,12 +715,12 @@ def add_activedata(self, branches, days, by_component):
             "web-platform-tests-reftests": (self.path_mod_wpt,
                                             [{"regex": {"result.test": "/css/css-.*"}},
                                              {"not": {"regex": {"result.test": "/css/css-.*"}}}]),
-            "crashtest": (self.path_mod_crashtest,
-                          [{"regex": {"result.test": ".*/tests/[a-m].*"}},
-                           {"not": {"regex": {"result.test": ".*/tests/[a-m].*"}}}]),
+            "crashtest": (None,
+                          [{"regex": {"result.test": "[a-g].*"}},
+                           {"not": {"regex": {"result.test": "[a-g].*"}}}]),
             "web-platform-tests-wdspec": (self.path_mod_wpt, [None]),
             "web-platform-tests-crashtests": (self.path_mod_wpt, [None]),
-            "xpcshell": (None, [None]),
+            "xpcshell": (self.path_mod_xpcshell, [None]),
             "mochitest-plain": (None, [None]),
             "mochitest-browser-chrome": (None, [None]),
             "mochitest-media": (None, [None]),