From d855b927434924f34031f2399a9cb9f697f22e4e Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Thu, 23 Jul 2020 21:34:20 +0000 Subject: [PATCH] Make presubmit_canned_checks inclusive This modifies CheckAuthorizedAuthor parameters to be inclusive while being backwards compatbile. Also, it fixes issue with empty lists. R=ehmaldonado@chromium.org Bug: 1098560 Change-Id: I992b25d6408d6cb906fa1696209de253e50c5156 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2316706 Reviewed-by: Edward Lesmes Commit-Queue: Josip Sokcevic --- presubmit_canned_checks.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index 2e582014d..695393f0e 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -103,10 +103,14 @@ def CheckChangeWasUploaded(input_api, output_api): ### Content checks -def CheckAuthorizedAuthor(input_api, output_api, bot_whitelist=None): +def CheckAuthorizedAuthor(input_api, output_api, bot_allowlist=None, + bot_whitelist=None): """For non-googler/chromites committers, verify the author's email address is in AUTHORS. """ + # TODO(https://crbug.com/1098560): Add warnings before removing BC. + if bot_allowlist is None: + bot_allowlist = bot_whitelist if input_api.is_committing: error_type = output_api.PresubmitError else: @@ -118,7 +122,7 @@ def CheckAuthorizedAuthor(input_api, output_api, bot_whitelist=None): return [] # This is used for CLs created by trusted robot accounts. - if bot_whitelist and author in bot_whitelist: + if bot_allowlist and author in bot_allowlist: return [] authors_path = input_api.os_path.join( @@ -621,8 +625,11 @@ def GetUnitTestsInDirectory( tests accordingly. """ # TODO(https://crbug.com/1098560): Add warnings before removing bc. - files_to_check = files_to_check or allowlist or whitelist - files_to_skip = files_to_skip or blocklist or blacklist + if files_to_check is None: + files_to_check = allowlist or whitelist + if files_to_skip is None: + files_to_skip = blocklist or blacklist + unit_tests = [] test_path = input_api.os_path.abspath( input_api.os_path.join(input_api.PresubmitLocalPath(), directory)) @@ -715,8 +722,11 @@ def GetUnitTestsRecursively(input_api, output_api, directory, Restricts itself to only find files within the Change's source repo, not dependencies. """ - files_to_check = files_to_check or allowlist or whitelist - files_to_skip = files_to_skip or blocklist or blacklist + # TODO(https://crbug.com/1098560): Add warnings before removing BC. + if files_to_check is None: + files_to_check = allowlist or whitelist + if files_to_skip is None: + files_to_skip = blocklist or blacklist assert files_to_check is not None assert files_to_skip is not None