Regenerate MANIFEST.json when WPT tests are run

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 733 matching lines @@
             urls = self._wpt_manifest().file_path_to_url_paths(match.group(1))
             for url in urls:
                 tests.append(file_path[0:match.start(1)] + url)
         return tests
 
     @memoized
     def _wpt_manifest(self):
         manifest_path = self._filesystem.join(self.layout_tests_dir(), 'external', 'wpt', 'MANIFEST.json')
         return WPTManifest(self._filesystem.read_text_file(manifest_path))
 
+    def _manifest_items_for_path(self, path_in_wpt):
+        """Returns a manifest item for the given WPT path, or None if not found.
+
+        The format of a manifest item depends on
+        https://github.com/w3c/wpt-tools/blob/master/manifest/item.py
+        and is assumed to be a list of the format [url, extras],
+        or [url, references, extras] for reftests, or None if not found.
+
+        For most testharness tests, the returned manifest_items is expected
+        to look like this:: [["/some/test/path.html", {}]]
+        """
+        items = self._wpt_manifest()['items']
+        if path_in_wpt in items['manual']:
+            return items['manual'][path_in_wpt]
+        elif path_in_wpt in items['reftest']:
+            return items['reftest'][path_in_wpt]
+        elif path_in_wpt in items['testharness']:
+            return items['testharness'][path_in_wpt]
+        return None

[jeffcarp, 2017/02/21 19:33:16]

This isn't part of my CL, not sure how it got in here.

[qyearsley, 2017/02/21 22:47:57]

This part was changed in https://codereview.chromium.org/2681733005 (after the
first patchset of this CL was uploaded), so it could be a merge issue

+
     def is_slow_wpt_test(self, test_file):
         match = re.match(r'external/wpt/(.*)', test_file)
         if not match:
             return False
         return self._wpt_manifest().is_slow_test(match.group(1))
 
     ALL_TEST_TYPES = ['audio', 'harness', 'pixel', 'ref', 'text', 'unknown']
 
     def test_type(self, test_name):
         fs = self._filesystem
@@ skipping 871 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)