Update canned PRESUBMIT checks to report that TBR does not apply to OWNERS.

Expansion of the tests to check for this are required.

Change-Id: Iae6294501659738df5097ce5a72da79e72818d98
Reviewed-on: https://chromium-review.googlesource.com/1030956
Reviewed-by: Aaron Gable <agable@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>

presubmit_canned_checks.py

@@ -845,9 +845,10 @@ def CheckOwnersFormat(input_api, output_api):
 def CheckOwners(input_api, output_api, source_file_filter=None):
   affected_files = set([f.LocalPath() for f in
       input_api.change.AffectedFiles(file_filter=source_file_filter)])
+  affects_owners = any('OWNERS' in name for name in affected_files)
 
   if input_api.is_committing:
-    if input_api.tbr and not any(['OWNERS' in name for name in affected_files]):
+    if input_api.tbr and not affects_owners:
       return [output_api.PresubmitNotifyResult(
           '--tbr was specified, skipping OWNERS check')]
     needed = 'LGTM from an OWNER'
@@ -885,6 +886,9 @@ def CheckOwners(input_api, output_api, source_file_filter=None):
     output_list = [
         output_fn('Missing %s for these files:\n    %s' %
                   (needed, '\n    '.join(sorted(missing_files))))]
+    if input_api.tbr and affects_owners:
+      output_list.append(output_fn('Note that TBR does not apply to changes '
+                                   'that affect OWNERS files.'))
     if not input_api.is_committing:
       suggested_owners = owners_db.reviewers_for(missing_files, owner_email)
       owners_with_comments = []

tests/presubmit_unittest.py

@@ -13,6 +13,7 @@ import itertools
 import logging
 import multiprocessing
 import os
+import re
 import sys
 import time
 import unittest
@@ -2507,14 +2508,17 @@ class CannedChecksUnittest(PresubmitTestsBase):
       change.OriginalOwnersFiles().AndReturn({})
       if not is_committing and uncovered_files:
         fake_db.reviewers_for(set(['foo']),
-            change.author_email).AndReturn(change.author_email)
+            change.author_email).AndReturn([change.author_email])
 
     self.mox.ReplayAll()
     output = presubmit.PresubmitOutput()
     results = presubmit_canned_checks.CheckOwners(input_api,
         presubmit.OutputApi)
-    if results:
-      results[0].handle(output)
+    for result in results:
+      result.handle(output)
+    if isinstance(expected_output, re._pattern_type):
+      self.assertRegexpMatches(output.getvalue(), expected_output)
+    else:
       self.assertEquals(output.getvalue(), expected_output)
 
   def testCannedCheckOwners_DryRun(self):
@@ -2710,8 +2714,9 @@ class CannedChecksUnittest(PresubmitTestsBase):
     self.AssertOwnersWorks(issue=None,
         is_committing=False,
         uncovered_files=set(['foo']),
-        expected_output='Missing OWNER reviewers for these files:\n'
-                        '    foo\n')
+        expected_output=re.compile(
+            'Missing OWNER reviewers for these files:\n'
+            '    foo\n', re.MULTILINE))
 
   def testCannedCheckOwners_NoIssueLocalReviewers(self):
     self.AssertOwnersWorks(issue=None,
@@ -2735,8 +2740,9 @@ class CannedChecksUnittest(PresubmitTestsBase):
         uncovered_files=set(['foo']),
         manually_specified_reviewers=['jane'],
         is_committing=False,
-        expected_output='Missing OWNER reviewers for these files:\n'
-                        '    foo\n')
+        expected_output=re.compile(
+            'Missing OWNER reviewers for these files:\n'
+            '    foo\n', re.MULTILINE))
 
   def testCannedCheckOwners_NoLGTM(self):
     self.AssertOwnersWorks(expected_output='Missing LGTM from someone '
@@ -2760,8 +2766,11 @@ class CannedChecksUnittest(PresubmitTestsBase):
     self.AssertOwnersWorks(
         tbr=True, uncovered_files=set(['foo']),
         modified_file='foo/OWNERS',
-        expected_output='Missing LGTM from an OWNER for these files:\n'
-                        '    foo\n')
+        expected_output=re.compile(
+            'Missing LGTM from an OWNER for these files:\n'
+            '    foo\n'
+            '.*TBR does not apply to changes that affect OWNERS files.',
+            re.MULTILINE))
 
   def testCannedCheckOwners_WithoutOwnerLGTM(self):
     self.AssertOwnersWorks(uncovered_files=set(['foo']),
@@ -2769,8 +2778,9 @@ class CannedChecksUnittest(PresubmitTestsBase):
                         '    foo\n')
     self.AssertOwnersWorks(uncovered_files=set(['foo']),
         is_committing=False,
-        expected_output='Missing OWNER reviewers for these files:\n'
-                        '    foo\n')
+        expected_output=re.compile(
+            'Missing OWNER reviewers for these files:\n'
+            '    foo\n', re.MULTILINE))
 
   def testCannedCheckOwners_WithLGTMs(self):
     self.AssertOwnersWorks(approvers=set(['ben@example.com']),