Rename update_w3c_test_expectations and related files.

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

 # Copyright 2014 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.
 
 """Fetches a copy of the latest state of a W3C test repository and commits.
 
 If this script is given the argument --auto-update, it will also:
  1. Upload a CL.
  2. Trigger try jobs and wait for them to complete.
  3. Make any changes that are required for new failing tests.
  4. Commit the CL.
 
 If this script is given the argument --auto-update, it will also attempt to
 upload a CL, trigger try jobs, and make any changes that are required for
 new failing tests before committing.
 """
 
 import argparse
 import json
 import logging
 import re
 
 from webkitpy.common.net.git_cl import GitCL
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationParser
-from webkitpy.w3c.update_w3c_test_expectations import W3CExpectationsLineAdder
+from webkitpy.w3c.common import WPT_REPO_URL, CSS_REPO_URL, WPT_DEST_NAME, CSS_DEST_NAME
+from webkitpy.w3c.directory_owners_extractor import DirectoryOwnersExtractor
 from webkitpy.w3c.test_copier import TestCopier
-from webkitpy.w3c.common import WPT_REPO_URL, CSS_REPO_URL, WPT_DEST_NAME, CSS_DEST_NAME
+from webkitpy.w3c.wpt_expectations_updater import WPTExpectationsUpdater
 
 # Settings for how often to check try job results and how long to wait.
 POLL_DELAY_SECONDS = 2 * 60
 TIMEOUT_SECONDS = 180 * 60
 
 _log = logging.getLogger(__file__)
 
 
 class TestImporter(object):
 
@@ skipping 278 matching lines @@
         if self.git_cl.has_failing_try_results(try_results):
             _log.info('CQ failed; aborting.')
             self.git_cl.run(['set-close'])
             return False
 
         _log.info('Update completed.')
         return True
 
     def _upload_cl(self):
         _log.info('Uploading change list.')
-        cc_list = self.get_directory_owners_to_cc()
+        cc_list = self.get_directory_owners()
         description = self._cl_description()
         self.git_cl.run([
             'upload',
             '-f',
             '--rietveld',
             '-m',
             description,
         ] + ['--cc=' + email for email in cc_list])
 
+    def get_directory_owners(self):
+        """Returns a list of email addresses of owners of changed tests."""
+        _log.info('Gathering directory owners emails to CC.')
+        changed_files = self.host.cwd().changed_files()
+        extractor = DirectoryOwnersExtractor(self.fs)
+        extractor.read_owner_map()
+        return extractor.list_owners(changed_files)
+
     def _cl_description(self):
         description = self.check_run(['git', 'log', '-1', '--format=%B'])
         build_link = self._build_link()
         if build_link:
             description += 'Build: %s\n\n' % build_link
         description += 'TBR=qyearsley@chromium.org\n'
         # Move any NOEXPORT tag to the end of the description.
         description = description.replace('NOEXPORT=true', '')
         description = description.replace('\n\n\n\n', '\n\n')
         description += 'NOEXPORT=true'
         return description
 
     def _build_link(self):
         """Returns a link to a job, if running on buildbot."""
         master_name = self.host.environ.get('BUILDBOT_MASTERNAME')
         builder_name = self.host.environ.get('BUILDBOT_BUILDERNAME')
         build_number = self.host.environ.get('BUILDBOT_BUILDNUMBER')
         if not (master_name and builder_name and build_number):
             return None
         return 'https://build.chromium.org/p/%s/builders/%s/builds/%s' % (master_name, builder_name, build_number)
 
-    def get_directory_owners_to_cc(self):
-        """Returns a list of email addresses to CC for the current import."""
-        _log.info('Gathering directory owners emails to CC.')
-        directory_owners_file_path = self.finder.path_from_webkit_base(
-            'Tools', 'Scripts', 'webkitpy', 'w3c', 'directory_owners.json')
-        with open(directory_owners_file_path) as data_file:
-            directory_to_owner = self.parse_directory_owners(json.load(data_file))
-        out = self.check_run(['git', 'diff', 'origin/master', '--name-only'])
-        changed_files = out.splitlines()
-        return self.generate_email_list(changed_files, directory_to_owner)
-
-    @staticmethod
-    def parse_directory_owners(decoded_data_file):
-        directory_dict = {}
-        for dict_set in decoded_data_file:
-            if dict_set['notification-email']:
-                directory_dict[dict_set['directory']] = dict_set['notification-email']
-        return directory_dict
-
-    def generate_email_list(self, changed_files, directory_to_owner):
-        """Returns a list of email addresses based on the given file list and
-        directory-to-owner mapping.
-
-        Args:
-            changed_files: A list of file paths relative to the repository root.
-            directory_to_owner: A dict mapping layout test directories to emails.
-
-        Returns:
-            A list of the email addresses to be notified for the current import.
-        """
-        email_addresses = set()
-        for file_path in changed_files:
-            test_path = self.finder.layout_test_name(file_path)
-            if test_path is None:
-                continue
-            test_dir = self.fs.dirname(test_path)
-            if test_dir in directory_to_owner:
-                address = directory_to_owner[test_dir]
-                if not re.match(r'\S+@\S+', address):
-                    _log.warning('%s appears not be an email address, skipping.', address)
-                    continue
-                email_addresses.add(address)
-        return sorted(email_addresses)
-
     def fetch_new_expectations_and_baselines(self):
         """Adds new expectations and downloads baselines based on try job results, then commits and uploads the change."""
         _log.info('Adding test expectations lines to LayoutTests/TestExpectations.')
-        line_adder = W3CExpectationsLineAdder(self.host)
+        line_adder = WPTExpectationsUpdater(self.host)
         line_adder.run()
         message = 'Update test expectations and baselines.'
         self.check_run(['git', 'commit', '-a', '-m', message])
         self.git_cl.run(['upload', '-m', message, '--rietveld'])
 
     def update_all_test_expectations_files(self, deleted_tests, renamed_tests):
         """Updates all test expectations files for tests that have been deleted or renamed."""
         port = self.host.port_factory.get()
         for path, file_contents in port.all_expectations_dict().iteritems():
             parser = TestExpectationParser(port, all_tests=None, is_lint_mode=False)
@@ skipping 35 matching lines @@
         """Returns a dict mapping source to dest name for layout tests that have been renamed."""
         out = self.check_run(['git', 'diff', 'origin/master', '-M100%', '--diff-filter=R', '--name-status'])
         renamed_tests = {}
         for line in out.splitlines():
             _, source_path, dest_path = line.split()
             source_test = self.finder.layout_test_name(source_path)
             dest_test = self.finder.layout_test_name(dest_path)
             if source_test and dest_test:
                 renamed_tests[source_test] = dest_test
         return renamed_tests