From f7051d55dcf87af1d7dc2df7b26f624fa35950b8 Mon Sep 17 00:00:00 2001 From: "wez@chromium.org" Date: Tue, 2 Apr 2013 18:31:42 +0000 Subject: Update PRESUBMIT scripts to use PresubmitPromptOrNotify helper. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/13093006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191863 0039d316-1c4b-4281-b951-d872f2087c98 --- PRESUBMIT_test.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'PRESUBMIT_test.py') diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py index 8c4b3ff..ed7e190 100755 --- a/PRESUBMIT_test.py +++ b/PRESUBMIT_test.py @@ -43,6 +43,11 @@ class MockOutputApi(object): MockOutputApi.PresubmitResult.__init__(self, message, items, long_text) self.type = 'notify' + class PresubmitPromptOrNotify(PresubmitResult): + def __init__(self, message, items, long_text=''): + MockOutputApi.PresubmitResult.__init__(self, message, items, long_text) + self.type = 'promptOrNotify' + class MockFile(object): def __init__(self, local_path, new_contents): @@ -246,19 +251,7 @@ class IncludeOrderTest(unittest.TestCase): warnings = PRESUBMIT._CheckIncludeOrder(mock_input_api, mock_output_api) self.assertEqual(1, len(warnings)) self.assertEqual(2, len(warnings[0].items)) - self.assertEqual('warning', warnings[0].type) - - def testOnlyNotifyOnCommit(self): - mock_input_api = MockInputApi() - mock_input_api.is_committing = True - mock_output_api = MockOutputApi() - contents = ['#include ', - '#include '] - mock_input_api.files = [MockFile('something.cc', contents)] - warnings = PRESUBMIT._CheckIncludeOrder(mock_input_api, mock_output_api) - self.assertEqual(1, len(warnings)) - self.assertEqual(1, len(warnings[0].items)) - self.assertEqual('notify', warnings[0].type) + self.assertEqual('promptOrNotify', warnings[0].type) def testUncheckableIncludes(self): mock_input_api = MockInputApi() -- cgit v1.1