From d965db3047a233b0f778447c4bd799c950b10e9f Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Mon, 16 Nov 2015 09:46:56 +0000 Subject: [PATCH] depot_tools: move some checks from commit to upload BUG=553681 Review URL: https://codereview.chromium.org/1447463002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297559 0039d316-1c4b-4281-b951-d872f2087c98 --- presubmit_canned_checks.py | 14 ++++++-------- tests/presubmit_unittest.py | 9 ++++++++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index c04f84cf01..5247f1dc98 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -1103,19 +1103,17 @@ def PanProjectChecks(input_api, output_api, snapshot("checking nsobjects") results.extend(_CheckConstNSObject( input_api, output_api, source_file_filter=sources)) + snapshot("checking eol style") + results.extend(input_api.canned_checks.CheckChangeSvnEolStyle( + input_api, output_api, source_file_filter=text_files)) + snapshot("checking license") + results.extend(input_api.canned_checks.CheckLicense( + input_api, output_api, license_header, source_file_filter=sources)) - # The following checks are only done on commit, since the commit bot will - # auto-fix most of these. if input_api.is_committing: - snapshot("checking eol style") - results.extend(input_api.canned_checks.CheckChangeSvnEolStyle( - input_api, output_api, source_file_filter=text_files)) snapshot("checking svn mime types") results.extend(input_api.canned_checks.CheckSvnForCommonMimeTypes( input_api, output_api)) - snapshot("checking license") - results.extend(input_api.canned_checks.CheckLicense( - input_api, output_api, license_header, source_file_filter=sources)) snapshot("checking was uploaded") results.extend(input_api.canned_checks.CheckChangeWasUploaded( input_api, output_api)) diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index d72b6b1e88..2a90ab3c34 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -2896,6 +2896,13 @@ class CannedChecksUnittest(PresubmitTestsBase): input_api.AffectedSourceFiles(mox.IgnoreArg()).AndReturn([affected_file]) input_api.ReadFile(affected_file).AndReturn('Hey!\nHo!\nHey!\nHo!\n\n') + input_api.AffectedSourceFiles(mox.IgnoreArg()).AndReturn([affected_file]) + + input_api.AffectedSourceFiles(mox.IgnoreArg()).AndReturn([affected_file]) + input_api.ReadFile(affected_file, 'rb').AndReturn( + 'Hey!\nHo!\nHey!\nHo!\n\n') + affected_file.LocalPath() + self.mox.ReplayAll() results = presubmit_canned_checks.PanProjectChecks( input_api, @@ -2905,7 +2912,7 @@ class CannedChecksUnittest(PresubmitTestsBase): license_header=None, project_name=None, owners_check=False) - self.assertEqual(1, len(results)) + self.assertEqual(2, len(results)) self.assertEqual( 'Found line ending with white spaces in:', results[0]._message) self.checkstdout('')