From 48492322a07d8c42bee0c63bf97490bdf8cc669f Mon Sep 17 00:00:00 2001 From: Edward Lesmes Date: Wed, 17 Mar 2021 16:47:09 +0000 Subject: [PATCH] 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 > Commit-Queue: Edward Lesmes > Reviewed-by: Josip Sokcevic 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 Commit-Queue: Rubber Stamper Bot-Commit: Rubber Stamper --- presubmit_support.py | 12 ++++-------- tests/presubmit_unittest.py | 5 ++--- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/presubmit_support.py b/presubmit_support.py index 9b339d4e4..3a05c4b8e 100755 --- a/presubmit_support.py +++ b/presubmit_support.py @@ -652,14 +652,10 @@ class InputApi(object): # 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 diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index 8d9a9c5d6..fc4e1df40 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -178,7 +178,6 @@ index fe3de7b..54ae6e1 100755 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 @@ the current line as well! 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)