From e589f98b8e16df0aaaa58a33e1f29b511dbc8278 Mon Sep 17 00:00:00 2001 From: "raphael.kubo.da.costa@intel.com" Date: Fri, 19 Dec 2014 17:04:15 +0000 Subject: [PATCH] presubmit_unittest: Fix pylint errors. The recent pylint 1.3.1 and 1.4.0 upgrades have caused some new errors to be reported for presubmit_unittest: * presubmit_support.InputApi.AffectedFiles() expectes a parameter called |include_deletes|, not |include_deleted|. * The mock AffectedFiles() implementation in CannedChecksUnittest.testCannedCheckChangeHasNoTabs() had its signature updated to match the one in presubmit_support.InputApi, otherwise pylint would (erroneously) consider that this mock implementation was used in all other AffectedFiles() invocations in CannedChecksUnittest and complain that some parameters were missing. It makes more sense to do this than disable the check and miss real problems in the future. R=maruel@chromium.org, iannucci@chromium.org, pgervais@chromium.org BUG=443232 Review URL: https://codereview.chromium.org/802403003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293468 0039d316-1c4b-4281-b951-d872f2087c98 --- tests/presubmit_unittest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index fdd801e2b..3bb79b5c0 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -2000,7 +2000,7 @@ class CannedChecksUnittest(PresubmitTestsBase): if use_source_file: input_api1.AffectedSourceFiles(None).AndReturn(files1) else: - input_api1.AffectedFiles(include_deleted=False).AndReturn(files1) + input_api1.AffectedFiles(include_deletes=False).AndReturn(files1) presubmit.scm.SVN.GetFileProperty( presubmit.normpath('foo/bar.cc'), property_name, self.fake_root_dir ).AndReturn(value1) @@ -2017,7 +2017,7 @@ class CannedChecksUnittest(PresubmitTestsBase): if use_source_file: input_api2.AffectedSourceFiles(None).AndReturn(files2) else: - input_api2.AffectedFiles(include_deleted=False).AndReturn(files2) + input_api2.AffectedFiles(include_deletes=False).AndReturn(files2) presubmit.scm.SVN.GetFileProperty( presubmit.normpath('foo/bar.cc'), property_name, self.fake_root_dir @@ -2175,7 +2175,7 @@ class CannedChecksUnittest(PresubmitTestsBase): affected_files = (affected_file1, affected_file2, affected_file3, affected_file4) - def test(file_filter, include_deletes): + def test(include_dirs=False, include_deletes=True, file_filter=None): self.assertFalse(include_deletes) for x in affected_files: if file_filter(x):