Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: tests/presubmit_unittest.py

Issue 119427: Add CheckChangeHasDescription. (Closed)
Patch Set: Created 11 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « presubmit_canned_checks.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/presubmit_unittest.py
diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py
index aeeeaaaf82a67964e2c643614fabf7016fc775b0..76babc2f85f1b83b114e75858165fa942db1e71e 100755
--- a/tests/presubmit_unittest.py
+++ b/tests/presubmit_unittest.py
@@ -937,7 +937,8 @@ class CannedChecksUnittest(PresubmitTestsBase):
def testMembersChanged(self):
self.mox.ReplayAll()
members = [
- 'CheckChangeHasBugField', 'CheckChangeHasNoCR', 'CheckChangeHasNoTabs',
+ 'CheckChangeHasBugField', 'CheckChangeHasDescription',
+ 'CheckChangeHasNoCR', 'CheckChangeHasNoTabs',
'CheckChangeHasQaField', 'CheckChangeHasTestedField',
'CheckChangeHasTestField', 'CheckChangeSvnEolStyle',
'CheckDoNotSubmit',
@@ -947,11 +948,14 @@ class CannedChecksUnittest(PresubmitTestsBase):
# If this test fails, you should add the relevant test.
self.compareMembers(presubmit_canned_checks, members)
- def DescriptionTest(self, check, description1, description2, error_type):
+ def DescriptionTest(self, check, description1, description2, error_type,
+ committing):
input_api1 = self.MockInputApi()
- input_api1.change = self.MakeBasicChange('foo', 'Foo\n' + description1)
+ input_api1.is_committing = committing
+ input_api1.change = self.MakeBasicChange('foo', description1)
input_api2 = self.MockInputApi()
- input_api2.change = self.MakeBasicChange('foo', 'Foo\n' + description2)
+ input_api2.is_committing = committing
+ input_api2.change = self.MakeBasicChange('foo', description2)
self.mox.ReplayAll()
results1 = check(input_api1, presubmit.OutputApi)
@@ -989,28 +993,44 @@ class CannedChecksUnittest(PresubmitTestsBase):
def testCannedCheckChangeHasBugField(self):
self.DescriptionTest(presubmit_canned_checks.CheckChangeHasBugField,
- 'BUG=1234', '',
- presubmit.OutputApi.PresubmitNotifyResult)
-
+ 'Foo\nBUG=1234', 'Foo\n',
+ presubmit.OutputApi.PresubmitNotifyResult,
+ False)
+
+ def testCheckChangeHasDescription(self):
+ self.DescriptionTest(presubmit_canned_checks.CheckChangeHasDescription,
+ 'Bleh', '',
+ presubmit.OutputApi.PresubmitNotifyResult,
+ False)
+ self.mox.VerifyAll()
+ self.DescriptionTest(presubmit_canned_checks.CheckChangeHasDescription,
+ 'Bleh', '',
+ presubmit.OutputApi.PresubmitError,
+ True)
+
def testCannedCheckChangeHasTestField(self):
self.DescriptionTest(presubmit_canned_checks.CheckChangeHasTestField,
- 'TEST=did some stuff', '',
- presubmit.OutputApi.PresubmitNotifyResult)
+ 'Foo\nTEST=did some stuff', 'Foo\n',
+ presubmit.OutputApi.PresubmitNotifyResult,
+ False)
def testCannedCheckChangeHasTestedField(self):
self.DescriptionTest(presubmit_canned_checks.CheckChangeHasTestedField,
- 'TESTED=did some stuff', '',
- presubmit.OutputApi.PresubmitError)
+ 'Foo\nTESTED=did some stuff', 'Foo\n',
+ presubmit.OutputApi.PresubmitError,
+ False)
def testCannedCheckChangeHasQAField(self):
self.DescriptionTest(presubmit_canned_checks.CheckChangeHasQaField,
- 'QA=BSOD your machine', '',
- presubmit.OutputApi.PresubmitError)
+ 'Foo\nQA=BSOD your machine', 'Foo\n',
+ presubmit.OutputApi.PresubmitError,
+ False)
def testCannedCheckDoNotSubmitInDescription(self):
self.DescriptionTest(presubmit_canned_checks.CheckDoNotSubmitInDescription,
- 'DO NOTSUBMIT', 'DO NOT ' + 'SUBMIT',
- presubmit.OutputApi.PresubmitError)
+ 'Foo\nDO NOTSUBMIT', 'Foo\nDO NOT ' + 'SUBMIT',
+ presubmit.OutputApi.PresubmitError,
+ False)
def testCannedCheckDoNotSubmitInFiles(self):
self.ContentTest(
« no previous file with comments | « presubmit_canned_checks.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698