Commit 7bbfdf1e authored by Edward Lemur's avatar Edward Lemur Committed by Commit Bot

PRESUBMIT: Fix usage of AffectedFiles.

The first argument to AffectedFiles is include_deletes,
so current usage sets it to include deleted files and
ignores the filter, causing checks to run on unrelated
files.

Fix it so that the source filter is passed to the right
parameter.

Bug: 962619
Change-Id: I94f550a72f2773d5fedc5949848dcd2defd5757e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1610541
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#731781}
parent a5dfedf7
...@@ -3306,7 +3306,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api): ...@@ -3306,7 +3306,7 @@ def _CheckAndroidTestJUnitFrameworkImport(input_api, output_api):
sources = lambda x: input_api.FilterSourceFile( sources = lambda x: input_api.FilterSourceFile(
x, white_list=[r'.*\.java$'], black_list=None) x, white_list=[r'.*\.java$'], black_list=None)
errors = [] errors = []
for f in input_api.AffectedFiles(sources): for f in input_api.AffectedFiles(file_filter=sources):
for line_num, line in f.ChangedContents(): for line_num, line in f.ChangedContents():
if deprecated_junit_framework_pattern.search(line): if deprecated_junit_framework_pattern.search(line):
errors.append("%s:%d" % (f.LocalPath(), line_num)) errors.append("%s:%d" % (f.LocalPath(), line_num))
...@@ -3330,7 +3330,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api): ...@@ -3330,7 +3330,7 @@ def _CheckAndroidTestJUnitInheritance(input_api, output_api):
sources = lambda x: input_api.FilterSourceFile( sources = lambda x: input_api.FilterSourceFile(
x, white_list=[r'.*Test\.java$'], black_list=None) x, white_list=[r'.*Test\.java$'], black_list=None)
errors = [] errors = []
for f in input_api.AffectedFiles(sources): for f in input_api.AffectedFiles(file_filter=sources):
if not f.OldContents(): if not f.OldContents():
class_declaration_start_flag = False class_declaration_start_flag = False
for line_num, line in f.ChangedContents(): for line_num, line in f.ChangedContents():
...@@ -3359,7 +3359,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api): ...@@ -3359,7 +3359,7 @@ def _CheckAndroidTestAnnotationUsage(input_api, output_api):
sources = lambda x: input_api.FilterSourceFile( sources = lambda x: input_api.FilterSourceFile(
x, white_list=[r'.*\.java$'], black_list=None) x, white_list=[r'.*\.java$'], black_list=None)
errors = [] errors = []
for f in input_api.AffectedFiles(sources): for f in input_api.AffectedFiles(file_filter=sources):
for line_num, line in f.ChangedContents(): for line_num, line in f.ChangedContents():
if deprecated_annotation_import_pattern.search(line): if deprecated_annotation_import_pattern.search(line):
errors.append("%s:%d" % (f.LocalPath(), line_num)) errors.append("%s:%d" % (f.LocalPath(), line_num))
......
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