Skip to content

Commit

Permalink
Use inclusive parameter names in PRESUBMIT
Browse files Browse the repository at this point in the history
Change-Id: Ic48fe52969335c74cef4f7df7258eb9cad556e04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616523
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Sam Clegg <sbc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842118}
  • Loading branch information
sokcevicG authored and Chromium LUCI CQ committed Jan 11, 2021
1 parent 051b979 commit 83c9b78
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 35 deletions.
2 changes: 1 addition & 1 deletion build/util/lib/common/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

def _RunTests(input_api, output_api):
return (input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=[r'.+_test.py$']))
input_api, output_api, '.', files_to_check=[r'.+_test.py$']))


def CheckChangeOnUpload(input_api, output_api):
Expand Down
7 changes: 4 additions & 3 deletions native_client_sdk/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@ def CommonChecks(input_api, output_api):
'E1103', # subprocess.communicate() generates these :(
'R0201', # method could be function (doesn't reference self)
]
black_list = [
files_to_skip = [
r'src[\\\/]build_tools[\\\/]tests[\\\/].*',
r'src[\\\/]build_tools[\\\/]sdk_tools[\\\/]third_party[\\\/].*',
r'src[\\\/]doc[\\\/]*',
r'src[\\\/]gonacl_appengine[\\\/]*',
]
canned = input_api.canned_checks
output.extend(canned.RunPylint(input_api, output_api, black_list=black_list,
disabled_warnings=disabled_warnings))
output.extend(canned.RunPylint(input_api, output_api,
files_to_skip=files_to_skip,
disabled_warnings=disabled_warnings))
return output


Expand Down
2 changes: 1 addition & 1 deletion testing/scripts/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

def CommonChecks(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=[r'^.+_unittest\.py$'])
input_api, output_api, '.', files_to_check=[r'^.+_unittest\.py$'])

def CheckChangeOnUpload(input_api, output_api):
return CommonChecks(input_api, output_api)
Expand Down
2 changes: 1 addition & 1 deletion testing/trigger_scripts/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

def CommonChecks(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=['.*test.py'])
input_api, output_api, '.', files_to_check=['.*test.py'])

def CheckChangeOnUpload(input_api, output_api):
return CommonChecks(input_api, output_api)
Expand Down
8 changes: 5 additions & 3 deletions tools/android/native_lib_memory/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@

def CommonChecks(input_api, output_api):
output = []
blacklist = []
output.extend(input_api.canned_checks.RunPylint(
input_api, output_api, black_list=blacklist))
files_to_skip = []
output.extend(
input_api.canned_checks.RunPylint(input_api,
output_api,
files_to_skip=files_to_skip))
output.extend(input_api.canned_checks.RunUnitTests(
input_api,
output_api,
Expand Down
8 changes: 5 additions & 3 deletions tools/cygprofile/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@

def CommonChecks(input_api, output_api):
output = []
blacklist = []
output.extend(input_api.canned_checks.RunPylint(
input_api, output_api, black_list=blacklist))
files_to_skip = []
output.extend(
input_api.canned_checks.RunPylint(input_api,
output_api,
files_to_skip=files_to_skip))
output.extend(input_api.canned_checks.RunUnitTests(
input_api,
output_api,
Expand Down
5 changes: 3 additions & 2 deletions tools/find_runtime_symbols/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ def join(*args):

output.extend(
input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api,
input_api,
output_api,
input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'),
whitelist=[r'.+_test\.py$']))
files_to_check=[r'.+_test\.py$']))

if input_api.is_committing:
output.extend(input_api.canned_checks.PanProjectChecks(input_api,
Expand Down
12 changes: 6 additions & 6 deletions tools/find_runtime_symbols/find_runtime_symbols.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@

class RuntimeSymbolsInProcess(object):
def __init__(self):
self._maps = None
self.maps = None
self._static_symbols_in_filse = {}

def find_procedure(self, runtime_address):
for vma in self._maps.iter(ProcMaps.executable):
for vma in self.maps.iter(ProcMaps.executable):
if vma.begin <= runtime_address < vma.end:
static_symbols = self._static_symbols_in_filse.get(vma.name)
if static_symbols:
Expand All @@ -59,7 +59,7 @@ def find_procedure(self, runtime_address):
return None

def find_sourcefile(self, runtime_address):
for vma in self._maps.iter(ProcMaps.executable):
for vma in self.maps.iter(ProcMaps.executable):
if vma.begin <= runtime_address < vma.end:
static_symbols = self._static_symbols_in_filse.get(vma.name)
if static_symbols:
Expand All @@ -70,7 +70,7 @@ def find_sourcefile(self, runtime_address):
return None

def find_typeinfo(self, runtime_address):
for vma in self._maps.iter(ProcMaps.constants):
for vma in self.maps.iter(ProcMaps.constants):
if vma.begin <= runtime_address < vma.end:
static_symbols = self._static_symbols_in_filse.get(vma.name)
if static_symbols:
Expand All @@ -85,12 +85,12 @@ def load(prepared_data_dir):
symbols_in_process = RuntimeSymbolsInProcess()

with open(os.path.join(prepared_data_dir, _MAPS_FILENAME), mode='r') as f:
symbols_in_process._maps = ProcMaps.load_file(f)
symbols_in_process.maps = ProcMaps.load_file(f)
with open(os.path.join(prepared_data_dir, _FILES_FILENAME), mode='r') as f:
files = json.load(f)

# pylint: disable=W0212
for vma in symbols_in_process._maps.iter(ProcMaps.executable_and_constants):
for vma in symbols_in_process.maps.iter(ProcMaps.executable_and_constants):
file_entry = files.get(vma.name)
if not file_entry:
continue
Expand Down
4 changes: 2 additions & 2 deletions tools/idl_parser/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

def CheckChangeOnUpload(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST)
input_api, output_api, '.', files_to_check=WHITELIST)


def CheckChangeOnCommit(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST)
input_api, output_api, '.', files_to_check=WHITELIST)
4 changes: 2 additions & 2 deletions tools/json_schema_compiler/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

def CheckChangeOnUpload(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST)
input_api, output_api, '.', files_to_check=WHITELIST)


def CheckChangeOnCommit(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST)
input_api, output_api, '.', files_to_check=WHITELIST)
4 changes: 2 additions & 2 deletions tools/json_to_struct/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

def CheckChangeOnUpload(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST)
input_api, output_api, '.', files_to_check=WHITELIST)


def CheckChangeOnCommit(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST)
input_api, output_api, '.', files_to_check=WHITELIST)
5 changes: 3 additions & 2 deletions tools/linux/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ def join(*args):

output.extend(
input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api,
input_api,
output_api,
input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'),
whitelist=[r'.+_tests\.py$']))
files_to_check=[r'.+_tests\.py$']))

if input_api.is_committing:
output.extend(input_api.canned_checks.PanProjectChecks(input_api,
Expand Down
17 changes: 10 additions & 7 deletions tools/memory_inspector/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@

def _CommonChecks(input_api, output_api):
output = []
blacklist = [r'classification_rules.*']
output.extend(input_api.canned_checks.RunPylint(
input_api, output_api, black_list=blacklist,
extra_paths_list=[
input_api.os_path.join(input_api.PresubmitLocalPath(), '..', '..',
'build', 'android')
]))
files_to_skip = [r'classification_rules.*']
output.extend(
input_api.canned_checks.RunPylint(input_api,
output_api,
files_to_skip=files_to_skip,
extra_paths_list=[
input_api.os_path.join(
input_api.PresubmitLocalPath(),
'..', '..', 'build', 'android')
]))
output.extend(input_api.canned_checks.RunUnitTests(
input_api,
output_api,
Expand Down

0 comments on commit 83c9b78

Please sign in to comment.