Commit 83c9b78d authored by Josip Sokcevic's avatar Josip Sokcevic Committed by Chromium LUCI CQ

Use inclusive parameter names in PRESUBMIT

Change-Id: Ic48fe52969335c74cef4f7df7258eb9cad556e04
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616523
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Reviewed-by: default avatarSam Clegg <sbc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842118}
parent 051b9793
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
def _RunTests(input_api, output_api): def _RunTests(input_api, output_api):
return (input_api.canned_checks.RunUnitTestsInDirectory( 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): def CheckChangeOnUpload(input_api, output_api):
......
...@@ -19,14 +19,15 @@ def CommonChecks(input_api, output_api): ...@@ -19,14 +19,15 @@ def CommonChecks(input_api, output_api):
'E1103', # subprocess.communicate() generates these :( 'E1103', # subprocess.communicate() generates these :(
'R0201', # method could be function (doesn't reference self) 'R0201', # method could be function (doesn't reference self)
] ]
black_list = [ files_to_skip = [
r'src[\\\/]build_tools[\\\/]tests[\\\/].*', r'src[\\\/]build_tools[\\\/]tests[\\\/].*',
r'src[\\\/]build_tools[\\\/]sdk_tools[\\\/]third_party[\\\/].*', r'src[\\\/]build_tools[\\\/]sdk_tools[\\\/]third_party[\\\/].*',
r'src[\\\/]doc[\\\/]*', r'src[\\\/]doc[\\\/]*',
r'src[\\\/]gonacl_appengine[\\\/]*', r'src[\\\/]gonacl_appengine[\\\/]*',
] ]
canned = input_api.canned_checks canned = input_api.canned_checks
output.extend(canned.RunPylint(input_api, output_api, black_list=black_list, output.extend(canned.RunPylint(input_api, output_api,
files_to_skip=files_to_skip,
disabled_warnings=disabled_warnings)) disabled_warnings=disabled_warnings))
return output return output
......
...@@ -10,7 +10,7 @@ for more details about the presubmit API built into depot_tools. ...@@ -10,7 +10,7 @@ for more details about the presubmit API built into depot_tools.
def CommonChecks(input_api, output_api): def CommonChecks(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory( 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): def CheckChangeOnUpload(input_api, output_api):
return CommonChecks(input_api, output_api) return CommonChecks(input_api, output_api)
......
...@@ -10,7 +10,7 @@ for more details about the presubmit API built into depot_tools. ...@@ -10,7 +10,7 @@ for more details about the presubmit API built into depot_tools.
def CommonChecks(input_api, output_api): def CommonChecks(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory( 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): def CheckChangeOnUpload(input_api, output_api):
return CommonChecks(input_api, output_api) return CommonChecks(input_api, output_api)
......
...@@ -11,9 +11,11 @@ for more details on the presubmit API built into depot_tools. ...@@ -11,9 +11,11 @@ for more details on the presubmit API built into depot_tools.
def CommonChecks(input_api, output_api): def CommonChecks(input_api, output_api):
output = [] output = []
blacklist = [] files_to_skip = []
output.extend(input_api.canned_checks.RunPylint( output.extend(
input_api, output_api, black_list=blacklist)) input_api.canned_checks.RunPylint(input_api,
output_api,
files_to_skip=files_to_skip))
output.extend(input_api.canned_checks.RunUnitTests( output.extend(input_api.canned_checks.RunUnitTests(
input_api, input_api,
output_api, output_api,
......
...@@ -11,9 +11,11 @@ for more details on the presubmit API built into depot_tools. ...@@ -11,9 +11,11 @@ for more details on the presubmit API built into depot_tools.
def CommonChecks(input_api, output_api): def CommonChecks(input_api, output_api):
output = [] output = []
blacklist = [] files_to_skip = []
output.extend(input_api.canned_checks.RunPylint( output.extend(
input_api, output_api, black_list=blacklist)) input_api.canned_checks.RunPylint(input_api,
output_api,
files_to_skip=files_to_skip))
output.extend(input_api.canned_checks.RunUnitTests( output.extend(input_api.canned_checks.RunUnitTests(
input_api, input_api,
output_api, output_api,
......
...@@ -26,9 +26,10 @@ def CommonChecks(input_api, output_api): ...@@ -26,9 +26,10 @@ def CommonChecks(input_api, output_api):
output.extend( output.extend(
input_api.canned_checks.RunUnitTestsInDirectory( input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, input_api,
output_api,
input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'), input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'),
whitelist=[r'.+_test\.py$'])) files_to_check=[r'.+_test\.py$']))
if input_api.is_committing: if input_api.is_committing:
output.extend(input_api.canned_checks.PanProjectChecks(input_api, output.extend(input_api.canned_checks.PanProjectChecks(input_api,
......
...@@ -44,11 +44,11 @@ _FILES_FILENAME = 'files.json' ...@@ -44,11 +44,11 @@ _FILES_FILENAME = 'files.json'
class RuntimeSymbolsInProcess(object): class RuntimeSymbolsInProcess(object):
def __init__(self): def __init__(self):
self._maps = None self.maps = None
self._static_symbols_in_filse = {} self._static_symbols_in_filse = {}
def find_procedure(self, runtime_address): 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: if vma.begin <= runtime_address < vma.end:
static_symbols = self._static_symbols_in_filse.get(vma.name) static_symbols = self._static_symbols_in_filse.get(vma.name)
if static_symbols: if static_symbols:
...@@ -59,7 +59,7 @@ class RuntimeSymbolsInProcess(object): ...@@ -59,7 +59,7 @@ class RuntimeSymbolsInProcess(object):
return None return None
def find_sourcefile(self, runtime_address): 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: if vma.begin <= runtime_address < vma.end:
static_symbols = self._static_symbols_in_filse.get(vma.name) static_symbols = self._static_symbols_in_filse.get(vma.name)
if static_symbols: if static_symbols:
...@@ -70,7 +70,7 @@ class RuntimeSymbolsInProcess(object): ...@@ -70,7 +70,7 @@ class RuntimeSymbolsInProcess(object):
return None return None
def find_typeinfo(self, runtime_address): 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: if vma.begin <= runtime_address < vma.end:
static_symbols = self._static_symbols_in_filse.get(vma.name) static_symbols = self._static_symbols_in_filse.get(vma.name)
if static_symbols: if static_symbols:
...@@ -85,12 +85,12 @@ class RuntimeSymbolsInProcess(object): ...@@ -85,12 +85,12 @@ class RuntimeSymbolsInProcess(object):
symbols_in_process = RuntimeSymbolsInProcess() symbols_in_process = RuntimeSymbolsInProcess()
with open(os.path.join(prepared_data_dir, _MAPS_FILENAME), mode='r') as f: 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: with open(os.path.join(prepared_data_dir, _FILES_FILENAME), mode='r') as f:
files = json.load(f) files = json.load(f)
# pylint: disable=W0212 # 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) file_entry = files.get(vma.name)
if not file_entry: if not file_entry:
continue continue
......
...@@ -7,9 +7,9 @@ WHITELIST = [ r'^.+_test\.py$' ] ...@@ -7,9 +7,9 @@ WHITELIST = [ r'^.+_test\.py$' ]
def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnUpload(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory( 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): def CheckChangeOnCommit(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory( return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST) input_api, output_api, '.', files_to_check=WHITELIST)
...@@ -12,9 +12,9 @@ WHITELIST = [ r'.+_test.py$' ] ...@@ -12,9 +12,9 @@ WHITELIST = [ r'.+_test.py$' ]
def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnUpload(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory( 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): def CheckChangeOnCommit(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory( return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST) input_api, output_api, '.', files_to_check=WHITELIST)
...@@ -12,9 +12,9 @@ WHITELIST = [ r'.+_test.py$' ] ...@@ -12,9 +12,9 @@ WHITELIST = [ r'.+_test.py$' ]
def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnUpload(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory( 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): def CheckChangeOnCommit(input_api, output_api):
return input_api.canned_checks.RunUnitTestsInDirectory( return input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, '.', whitelist=WHITELIST) input_api, output_api, '.', files_to_check=WHITELIST)
...@@ -26,9 +26,10 @@ def CommonChecks(input_api, output_api): ...@@ -26,9 +26,10 @@ def CommonChecks(input_api, output_api):
output.extend( output.extend(
input_api.canned_checks.RunUnitTestsInDirectory( input_api.canned_checks.RunUnitTestsInDirectory(
input_api, output_api, input_api,
output_api,
input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'), input_api.os_path.join(input_api.PresubmitLocalPath(), 'tests'),
whitelist=[r'.+_tests\.py$'])) files_to_check=[r'.+_tests\.py$']))
if input_api.is_committing: if input_api.is_committing:
output.extend(input_api.canned_checks.PanProjectChecks(input_api, output.extend(input_api.canned_checks.PanProjectChecks(input_api,
......
...@@ -11,12 +11,15 @@ details on the presubmit API built into depot_tools. ...@@ -11,12 +11,15 @@ details on the presubmit API built into depot_tools.
def _CommonChecks(input_api, output_api): def _CommonChecks(input_api, output_api):
output = [] output = []
blacklist = [r'classification_rules.*'] files_to_skip = [r'classification_rules.*']
output.extend(input_api.canned_checks.RunPylint( output.extend(
input_api, output_api, black_list=blacklist, input_api.canned_checks.RunPylint(input_api,
output_api,
files_to_skip=files_to_skip,
extra_paths_list=[ extra_paths_list=[
input_api.os_path.join(input_api.PresubmitLocalPath(), '..', '..', input_api.os_path.join(
'build', 'android') input_api.PresubmitLocalPath(),
'..', '..', 'build', 'android')
])) ]))
output.extend(input_api.canned_checks.RunUnitTests( output.extend(input_api.canned_checks.RunUnitTests(
input_api, input_api,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment