Change directory owner listing to list joint owners together.

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.
@@ skipping 359 matching lines @@
         description = self._cl_description(directory_owners)
         self.git_cl.run([
             'upload',
             '-f',
             '--gerrit',
             '-m',
             description,
         ] + ['--cc=' + email_address for email_address in directory_owners])
 
     def get_directory_owners(self):
-        """Returns a list of email addresses of owners of changed tests."""
+        """Returns a mapping of email addresses to owners of changed tests."""
         _log.info('Gathering directory owners emails to CC.')
         changed_files = self.host.git().changed_files()
         extractor = DirectoryOwnersExtractor(self.fs)
         extractor.read_owner_map()
         return extractor.list_owners(changed_files)
 
     def _cl_description(self, directory_owners):
+        """Returns a CL description string.
+
+        Args:
+            directory_owners: A dict of tuples of owner names to lists of directories.
+        """
         description = self.check_run(['git', 'log', '-1', '--format=%B'])
         build_link = current_build_link(self.host)
         if build_link:
             description += 'Build: %s\n\n' % build_link
 
         if directory_owners:
             description += self._format_directory_owners(directory_owners) + '\n\n'
         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
 
     @staticmethod
     def _format_directory_owners(directory_owners):
         message_lines = ['Directory owners for changes in this CL:']
-        for owner, directories in sorted(directory_owners.items()):
-            message_lines.append(owner + ':')
-            message_lines.extend(['  ' + d for d in directories])
+        for owner_tuple, directories in sorted(directory_owners.items()):
+            message_lines.append(', '.join(owner_tuple) + ':')
+            message_lines.extend('  ' + d for d in directories)
         return '\n'.join(message_lines)
 
     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.')
         expectation_updater = WPTExpectationsUpdater(self.host)
         expectation_updater.run(args=[])
         message = 'Update test expectations and baselines.'
         self.check_run(['git', 'commit', '-a', '-m', message])
         self.git_cl.run(['upload', '-m', message, '--gerrit'])
@@ skipping 41 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