Bug 1450166 - test-verify - Do not verify a test if it is skipped in any manifest; r=jmaher

testing/mozharness/mozharness/mozilla/testing/verify_tools.py

@@ -45,8 +45,16 @@ class VerifyToolsMixin(object):
         for (path, suite) in manifests:
             if os.path.exists(path):
                 man = TestManifest([path], strict=False)
-                active = man.active_tests(exists=False, disabled=False, filters=[], **mozinfo.info)
-                tests_by_path.update({t['relpath']:(suite,t.get('subsuite')) for t in active})
+                active = man.active_tests(exists=False, disabled=True, filters=[], **mozinfo.info)
+                # Remove disabled tests. Also, remove tests with the same path as
+                # disabled tests, even if they are not disabled, since test-verify
+                # specifies tests by path (it cannot distinguish between two or more
+                # tests with the same path specified in multiple manifests).
+                disabled = [t['relpath'] for t in active if 'disabled' in t]
+                new_by_path = {t['relpath']:(suite,t.get('subsuite')) \
+                               for t in active if 'disabled' not in t and \
+                               t['relpath'] not in disabled}
+                tests_by_path.update(new_by_path)
                 self.info("Verification updated with manifest %s" % path)
 
         ref_manifests = [