commit a58287b8ee082bbbb0cf13286649f135a9137bdc
author Edward Lesmes <ehmaldonado@google.com> Fri Jul 24 21:39:53 2020 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 24 21:39:53 2020 +0000
tree 58138d9dc81fd72e1ef2ec3a0ba62bbfcd6ae3e4
parent 9e8b8f310a5a25ae343eb35d3dcd81ff7f3e4450

presubmit: Also validate metadata in OWNERS files.

Bug: 1102997
Change-Id: Id847129d320004fcd121941f2e14cf9ad56ab4a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2318335
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

presubmit_canned_checks.py

diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py
index 695393f..5717727 100644
--- a/presubmit_canned_checks.py
+++ b/presubmit_canned_checks.py
@@ -1029,7 +1029,10 @@
 
 
 def CheckDirMetadataFormat(input_api, output_api):
-  file_filter = lambda f: input_api.basename(f.LocalPath()) == 'DIR_METADATA'
+  # TODO(crbug.com/1102997): Remove OWNERS once DIR_METADATA migration is
+  # complete.
+  file_filter = lambda f: (
+      input_api.basename(f.LocalPath()) in ('DIR_METADATA', 'OWNERS'))
   affected_files = set([
       f.LocalPath()
       for f in input_api.change.AffectedFiles(
@@ -1038,7 +1041,7 @@
   if not affected_files:
     return []
 
-  name = 'Validate DIR_METADATA files'
+  name = 'Validate metadata in OWNERS and DIR_METADATA files'
   dirmd_bin = 'dirmd.bat' if input_api.is_windows else 'dirmd'
   kwargs = {}
   if input_api.is_windows:

tests/presubmit_unittest.py

diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py
index 9b00784..7e2ffad 100755
--- a/tests/presubmit_unittest.py
+++ b/tests/presubmit_unittest.py
@@ -2559,10 +2559,12 @@
         'a/DIR_METADATA': ('M', ''),
         'a/b/OWNERS': ('M', ''),
         'c/DIR_METADATA': ('D', ''),
+        'd/unrelated': ('M', ''),
     })
 
     dirmd_bin = 'dirmd.bat' if input_api.is_windows else 'dirmd'
-    expected_cmd = [dirmd_bin, 'validate', 'DIR_METADATA', 'a/DIR_METADATA']
+    expected_cmd = [
+        dirmd_bin, 'validate', 'DIR_METADATA', 'a/DIR_METADATA', 'a/b/OWNERS']
 
     commands = presubmit_canned_checks.CheckDirMetadataFormat(
         input_api, presubmit.OutputApi)