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 720 matching lines @@
             if len(manifest_items) != 1:
                 continue
             url = manifest_items[0][0]
             if url[1:] != path_in_wpt:
                 # TODO(tkent): foo.any.js and bar.worker.js should be accessed
                 # as foo.any.html, foo.any.worker, and bar.worker with WPTServe.
                 continue
             tests.append(file_path)
         return tests
 
+    def _generate_manifest(self, dest_path):

[qyearsley, 2017/01/19 23:56:19]

I usually like to put helper methods under the methods that use them, because in
general this leads to a sequence of methods where higher-level bigger-picture
methods come first.

Here, since dest_path is only ever going to be the wpt directory, you could
remove that argument and have a variable
  wpt_path = self._webkit_finder.path_from_webkit_base('LayoutTests',
'external', 'wpt')

Then you could remove the logic for "css" below.

+        manifest_path = self._webkit_finder.path_from_webkit_base(
+            'Tools', 'Scripts', 'webkitpy', 'thirdparty', 'wpt', 'wpt', 'manifest')
+
+        if 'css' in dest_path:
+            # Do nothing for csswg-test.
+            return
+        _log.info('Generating MANIFEST.json')
+        self._executive.run_command([manifest_path, '--work', '--tests-root', dest_path])
+
     @memoized
     def _wpt_manifest(self):
+        # Regenerate manifest

[qyearsley, 2017/01/19 23:56:19]

Not sure if this comment is necessary, since the method name generate_manifest
should make this clear enough.

+        dest_path = self._webkit_finder.path_from_webkit_base('LayoutTests', 'external', 'wpt')
+        self._generate_manifest(dest_path)
+
         path = self._filesystem.join(self.layout_tests_dir(), 'external', 'wpt', 'MANIFEST.json')
         return json.loads(self._filesystem.read_text_file(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.
@@ skipping 898 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)