Change wpt_expectations_updater to not depend on TestParser.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_expectations_updater.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Updates expectations and baselines when updating web-platform-tests.
 
 Specifically, this class fetches results from try bots for the current CL, then
 (1) downloads new baseline files for any tests that can be rebaselined, and
 (2) updates the generic TestExpectations file for any other failing tests.
 """
 
 import argparse
 import copy
 import logging
 
 from webkitpy.common.memoized import memoized
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_expectations import TestExpectationLine, TestExpectations
-from webkitpy.w3c.test_parser import TestParser
+from webkitpy.w3c.wpt_manifest import WPTManifest
 
 _log = logging.getLogger(__name__)
 
 MARKER_COMMENT = '# ====== New tests from wpt-importer added here ======'
 
 
 class WPTExpectationsUpdater(object):
 
     def __init__(self, host):
         self.host = host
         self.finder = WebKitFinder(self.host.filesystem)
+        self.port = self.host.port_factory.get()
 
     def run(self, args=None):
         """Downloads text new baselines and adds test expectations lines."""
         parser = argparse.ArgumentParser(description=__doc__)
         parser.add_argument('-v', '--verbose', action='store_true', help='More verbose logging.')
         args = parser.parse_args(args)
 
         log_level = logging.DEBUG if args.verbose else logging.INFO
         logging.basicConfig(level=log_level, format='%(message)s')
 
         issue_number = self.get_issue_number()
         if issue_number == 'None':
             _log.error('No issue on current branch.')
             return 1
 
         builds = self.get_latest_try_jobs()
         _log.debug('Latest try jobs: %r', builds)
         if not builds:
             _log.error('No try job information was collected.')
             return 1
 
+        # The manifest may be used below to do check which tests are reference tests.
+        WPTManifest.ensure_manifest(self.host)
+
         # Here we build up a dict of failing test results for all platforms.
         test_expectations = {}
         for build in builds:
             port_results = self.get_failing_results_dict(build)
             test_expectations = self.merge_dicts(test_expectations, port_results)
 
         # And then we merge results for different platforms that had the same results.
         for test_name, platform_result in test_expectations.iteritems():
             # platform_result is a dict mapping platforms to results.
             test_expectations[test_name] = self.merge_same_valued_keys(platform_result)
@@ skipping 216 matching lines @@
             port_names: A list of full port names that the line should apply to.
             test_name: The test name for the expectation line.
 
         Returns:
             The specifier part of the new expectation line, e.g. "[ Mac ]".
             This will be an empty string if the line should apply to all platforms.
         """
         specifiers = []
         for name in sorted(port_names):
             specifiers.append(self.host.builders.version_specifier_for_port_name(name))
-        port = self.host.port_factory.get()
+
         specifiers.extend(self.skipped_specifiers(test_name))
-        specifiers = self.simplify_specifiers(specifiers, port.configuration_specifier_macros())
+        specifiers = self.simplify_specifiers(specifiers, self.port.configuration_specifier_macros())
         if not specifiers:
             return ''
         return '[ %s ]' % ' '.join(specifiers)
 
     @staticmethod
     def to_list(tuple_or_value):
         """Converts a tuple to a list, and a string value to a one-item list."""
         if isinstance(tuple_or_value, tuple):
             return list(tuple_or_value)
         return [tuple_or_value]
@@ skipping 51 matching lines @@
         The place in the file where the new lines are inserted is after a
         marker comment line. If this marker comment line is not found, it will
         be added to the end of the file.
 
         Args:
             line_list: A list of lines to add to the TestExpectations file.
         """
         _log.info('Lines to write to TestExpectations:')
         for line in line_list:
             _log.info('  %s', line)
-        port = self.host.port_factory.get()
-        expectations_file_path = port.path_to_generic_test_expectations_file()
+        expectations_file_path = self.port.path_to_generic_test_expectations_file()
         file_contents = self.host.filesystem.read_text_file(expectations_file_path)
         marker_comment_index = file_contents.find(MARKER_COMMENT)
         line_list = [line for line in line_list if self._test_name_from_expectation_string(line) not in file_contents]
         if not line_list:
             return
         if marker_comment_index == -1:
             file_contents += '\n%s\n' % MARKER_COMMENT
             file_contents += '\n'.join(line_list)
         else:
             end_of_marker_line = (file_contents[marker_comment_index:].find('\n')) + marker_comment_index
@@ skipping 55 matching lines @@
         new_test_results = copy.deepcopy(test_results)
         tests_to_rebaseline = set()
         for test_path in test_results:
             for platform, result in test_results[test_path].iteritems():
                 if self.can_rebaseline(test_path, result):
                     del new_test_results[test_path][platform]
                     tests_to_rebaseline.add(test_path)
         return sorted(tests_to_rebaseline), new_test_results
 
     def can_rebaseline(self, test_path, result):
-        return (self.is_js_test(test_path) and
-                result['actual'] not in ('CRASH', 'TIMEOUT'))
+        if self.is_reference_test(test_path):
+            return False
+        if result['actual'] in ('CRASH', 'TIMEOUT', 'MISSING'):
+            return False
+        return True
 
-    def is_js_test(self, test_path):
-        """Checks whether a given file is a testharness.js test.
-
-        TODO(qyearsley): This may not behave how we want it to for virtual tests.
-        TODO(qyearsley): Avoid using TestParser; maybe this should use
-        Port.test_type, or Port.reference_files to see whether it's not
-        a reference test?
-
-        Args:
-            test_path: A file path relative to the layout tests directory.
-                This might correspond to a deleted file or a non-test.
-        """
-        absolute_path = self.host.filesystem.join(self.finder.layout_tests_dir(), test_path)
-        test_parser = TestParser(absolute_path, self.host)
-        if not test_parser.test_doc:
-            return False
-        return test_parser.is_jstest()
+    def is_reference_test(self, test_path):
+        """Checks whether a given file is a testharness.js test."""
+        return bool(self.port.reference_files(test_path))
 
     def _get_try_bots(self):
         return self.host.builders.all_try_builder_names()