Change directory owner listing to list joint owners together.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.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.
 
 import collections
 
 from webkitpy.common.checkout.git_mock import MockGit
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.log_testing import LoggingTestCase
@@ skipping 98 matching lines @@
             description,
             ('Summary\n\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
 
     def test_cl_description_with_directory_owners(self):
         host = MockHost()
         host.executive = MockExecutive(output='Last commit message\n\n')
         importer = TestImporter(host)
         description = importer._cl_description(directory_owners={
-            'someone@chromium.org': ['external/wpt/foo', 'external/wpt/bar'],
-            'someone-else@chromium.org': ['external/wpt/baz'],
+            ('someone@chromium.org',): ['external/wpt/foo', 'external/wpt/bar'],
+            ('x@chromium.org', 'y@chromium.org'): ['external/wpt/baz'],
         })
         self.assertEqual(
             description,
             ('Last commit message\n\n'
              'Directory owners for changes in this CL:\n'
-             'someone-else@chromium.org:\n'
-             '  external/wpt/baz\n'
              'someone@chromium.org:\n'
              '  external/wpt/foo\n'
-             '  external/wpt/bar\n\n'
+             '  external/wpt/bar\n'
+             'x@chromium.org, y@chromium.org:\n'
+             '  external/wpt/baz\n\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
 
     def test_generate_manifest_command_not_found(self):
         # If we're updating csswg-test, then the manifest file won't be found.
         host = MockHost()
         host.filesystem.files = {}
         importer = TestImporter(host)
         importer._generate_manifest(
             '/mock-checkout/third_party/WebKit/LayoutTests/external/csswg-test')
@@ skipping 25 matching lines @@
     def test_get_directory_owners(self):
         host = MockHost()
         host.filesystem.write_text_file(
             '/mock-checkout/third_party/WebKit/LayoutTests/W3CImportExpectations',
             '## Owners: someone@chromium.org\n'
             '# external/wpt/foo [ Pass ]\n')
         git = MockGit()
         git.changed_files = lambda: ['third_party/WebKit/LayoutTests/external/wpt/foo/x.html']
         host.git = lambda: git
         importer = TestImporter(host)
-        self.assertEqual(importer.get_directory_owners(), {'someone@chromium.org': ['external/wpt/foo']})
+        self.assertEqual(importer.get_directory_owners(), {('someone@chromium.org',): ['external/wpt/foo']})
 
     def test_get_directory_owners_no_changed_files(self):
         host = MockHost()
         host.filesystem.write_text_file(
             '/mock-checkout/third_party/WebKit/LayoutTests/W3CImportExpectations',
             '## Owners: someone@chromium.org\n'
             '# external/wpt/foo [ Pass ]\n')
         importer = TestImporter(host)
         self.assertEqual(importer.get_directory_owners(), {})