commit 48492322a07d8c42bee0c63bf97490bdf8cc669f
author Edward Lesmes <ehmaldonado@chromium.org> Wed Mar 17 16:47:09 2021 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Mar 17 16:47:09 2021 +0000
tree 66690b63808e6c0b0bafb078fcceccfd6cdf4dba
parent 36de4be91ef66852c49aa5fd9e0cc31d5ec05ae9

Revert "presubmit: Use code-owners plugin if available."

This reverts commit 36de4be91ef66852c49aa5fd9e0cc31d5ec05ae9.

Reason for revert:
Not working for v8: crbug.com/1189233

Original change's description:
> presubmit: Use code-owners plugin if available.
>
> Change-Id: I56734de985731d007360a4a4e65f2b16de28b69a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2753894
> Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
> Reviewed-by: Josip Sokcevic <sokcevic@google.com>

Bug: 1189233
Change-Id: Id96277e1a6d3b9dcf5fc1bf4816706515b75e55c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2767720
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>

presubmit_support.py

diff --git a/presubmit_support.py b/presubmit_support.py
index 9b339d4..3a05c4b 100755
--- a/presubmit_support.py
+++ b/presubmit_support.py
@@ -652,14 +652,10 @@
     # Temporary files we must manually remove at the end of a run.
     self._named_temporary_files = []
 
-    self.owners_client = None
-    if self.gerrit:
-      self.owners_client = owners_client.GetCodeOwnersClient(
-          root=change.RepositoryRoot(),
-          upstream=change.UpstreamBranch(),
-          host=self.gerrit.host,
-          project=self.gerrit.project,
-          branch=self.gerrit.branch)
+    # TODO(dpranke): figure out a list of all approved owners for a repo
+    # in order to be able to handle wildcard OWNERS files?
+    self.owners_client = owners_client.DepotToolsClient(
+        change.RepositoryRoot(), change.UpstreamBranch(), os_path=self.os_path)
     self.owners_db = owners_db.Database(
         change.RepositoryRoot(), fopen=open, os_path=self.os_path)
     self.owners_finder = owners_finder.OwnersFinder

tests/presubmit_unittest.py

diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py
index 8d9a9c5..fc4e1df 100755
--- a/tests/presubmit_unittest.py
+++ b/tests/presubmit_unittest.py
@@ -178,7 +178,6 @@
     mock.patch('gclient_utils.FileWrite').start()
     mock.patch('json.load').start()
     mock.patch('multiprocessing.cpu_count', lambda: 2)
-    mock.patch('gerrit_util.IsCodeOwnersEnabled').start()
     mock.patch('os.chdir').start()
     mock.patch('os.getcwd', self.RootDir)
     mock.patch('os.listdir').start()
@@ -2750,9 +2749,9 @@
     input_api.dry_run = dry_run
     input_api.gerrit._FetchChangeDetail = lambda _: response
 
-    input_api.owners_client = owners_client.OwnersClient()
+    input_api.owners_client = owners_client.DepotToolsClient('root', 'branch')
 
-    with mock.patch('owners_client.OwnersClient.ListOwners',
+    with mock.patch('owners_client.DepotToolsClient.ListOwners',
                     side_effect=lambda f: owners_by_path.get(f, [])):
       results = presubmit_canned_checks.CheckOwners(
           input_api, presubmit.OutputApi, allow_tbr=allow_tbr)