diff --git a/PRESUBMIT.py b/PRESUBMIT.py index d0cc1bad3..7c68cab3f 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -91,8 +91,8 @@ def CommonChecks(input_api, output_api, tests_to_skip_list, run_on_python3): input_api, output_api, 'tests', - allowlist=test_to_run_list, - blocklist=tests_to_skip_list, + files_to_check=test_to_run_list, + files_to_skip=tests_to_skip_list, run_on_python3=run_on_python3)) # Validate CIPD manifests. diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index 59a32386d..5b41bb72c 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -7,6 +7,7 @@ from __future__ import print_function import os as _os +from warnings import warn _HERE = _os.path.dirname(_os.path.abspath(__file__)) # These filters will be disabled if callers do not explicitly supply a @@ -108,8 +109,9 @@ def CheckAuthorizedAuthor(input_api, output_api, bot_allowlist=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. + # TODO(https://crbug.com/1098560): Remove non inclusive parameter names. if bot_allowlist is None: + warn('Use bot_allowlist in CheckAuthorizedAuthor') bot_allowlist = bot_whitelist if input_api.is_committing: error_type = output_api.PresubmitError @@ -624,10 +626,12 @@ def GetUnitTestsInDirectory( It's mainly a wrapper for RunUnitTests. Use allowlist and blocklist to filter tests accordingly. """ - # TODO(https://crbug.com/1098560): Add warnings before removing bc. + # TODO(https://crbug.com/1098560): Remove non inclusive parameter names. if files_to_check is None: + warn('Use files_to_check in GetUnitTestsInDirectory') files_to_check = allowlist or whitelist if files_to_skip is None: + warn('Use files_to_skip in GetUnitTestsInDirectory') files_to_skip = blocklist or blacklist unit_tests = [] @@ -722,10 +726,12 @@ def GetUnitTestsRecursively(input_api, output_api, directory, Restricts itself to only find files within the Change's source repo, not dependencies. """ - # TODO(https://crbug.com/1098560): Add warnings before removing BC. + # TODO(https://crbug.com/1098560): Remove non inclusive parameter names. if files_to_check is None: + warn('Use files_to_check in GetUnitTestsRecursively') files_to_check = allowlist or whitelist if files_to_skip is None: + warn('Use files_to_skip in GetUnitTestsRecursively') files_to_skip = blocklist or blacklist assert files_to_check is not None assert files_to_skip is not None @@ -870,6 +876,13 @@ def GetPylint(input_api, output_api, files_to_check=None, files_to_skip=None, The default files_to_check enforces looking only at *.py files. """ + + # TODO(https://crbug.com/1098560): Remove non inclusive parameter names. + if allow_list or white_list: + warn('Use files_to_check in GetPylint') + if block_list or black_list: + warn('Use files_to_skip in GetPylint') + files_to_check = tuple(files_to_check or allow_list or white_list or (r'.*\.py$',)) files_to_skip = tuple(files_to_skip or block_list or black_list or diff --git a/presubmit_support.py b/presubmit_support.py index 53ed9c519..ee2883c2a 100755 --- a/presubmit_support.py +++ b/presubmit_support.py @@ -730,10 +730,12 @@ class InputApi(object): Note: Copy-paste this function to suit your needs or use a lambda function. """ - # TODO(https://crbug.com/1098560): Add warnings before removing bc. - if files_to_check is None: + # TODO(https://crbug.com/1098560): Remove non inclusive parameter names. + if files_to_check is None and (allow_list or white_list): + warn('Use files_to_check in FilterSourceFile') files_to_check = allow_list or white_list - if files_to_skip is None: + if files_to_skip is None and (block_list or black_list): + warn('Use files_to_skip in FilterSourceFile') files_to_skip = block_list or black_list if files_to_check is None: