WPT importer: List directory owners in CL description.

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 58 matching lines @@
         self.assertEqual(
             importer._commit_message('aaaa', '1111'),
             'Import 1111\n\n'
             'Using wpt-import in Chromium aaaa.\n\n'
             'NOEXPORT=true')
 
     def test_cl_description_with_empty_environ(self):
         host = MockHost()
         host.executive = MockExecutive(output='Last commit message\n\n')
         importer = TestImporter(host)
-        description = importer._cl_description()
+        description = importer._cl_description(directory_owners={})
         self.assertEqual(
             description,
             ('Last commit message\n\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
         self.assertEqual(host.executive.calls, [['git', 'log', '-1', '--format=%B']])
 
     def test_cl_description_with_environ_variables(self):
         host = MockHost()
         host.executive = MockExecutive(output='Last commit message\n')
         importer = TestImporter(host)
         importer.host.environ['BUILDBOT_MASTERNAME'] = 'my.master'
         importer.host.environ['BUILDBOT_BUILDERNAME'] = 'b'
         importer.host.environ['BUILDBOT_BUILDNUMBER'] = '123'
-        description = importer._cl_description()
+        description = importer._cl_description(directory_owners={})
         self.assertEqual(
             description,
             ('Last commit message\n'
              'Build: https://build.chromium.org/p/my.master/builders/b/builds/123\n\n'
              'TBR=qyearsley@chromium.org\n'
              'NOEXPORT=true'))
         self.assertEqual(host.executive.calls, [['git', 'log', '-1', '--format=%B']])
 
     def test_cl_description_moves_noexport_tag(self):
         host = MockHost()
         host.executive = MockExecutive(output='Summary\n\nNOEXPORT=true\n\n')
         importer = TestImporter(host)
-        description = importer._cl_description()
+        description = importer._cl_description(directory_owners={})
         self.assertEqual(
             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'],
+        })
+        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'
+             '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')
         self.assertEqual(host.executive.calls, [])
 
     def test_generate_manifest_successful_run(self):
@@ skipping 32 matching lines @@
         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(), {})