PRESUBMIT #include check: don't add a warning if we're committing.

PRESUBMIT_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 import unittest
 
 import PRESUBMIT
 
 
 class MockInputApi(object):
   def __init__(self):
     self.re = re
     self.os_path = os.path
     self.files = []
+    self.is_committing = False
 
   def AffectedFiles(self):
     return self.files
 
 
 class MockOutputApi(object):
   class PresubmitResult(object):
     def __init__(self, message, items=None, long_text=''):
       self.message = message
       self.items = items
       self.long_text = long_text
 
   class PresubmitError(PresubmitResult):
     def __init__(self, message, items, long_text=''):
       MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
+      self.type = 'error'
 
   class PresubmitPromptWarning(PresubmitResult):
     def __init__(self, message, items, long_text=''):
       MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
+      self.type = 'warning'
 
   class PresubmitNotifyResult(PresubmitResult):
     def __init__(self, message, items, long_text=''):
       MockOutputApi.PresubmitResult.__init__(self, message, items, long_text)
+      self.type = 'notify'
 
 
 class MockFile(object):
   def __init__(self, local_path, new_contents):
     self._local_path = local_path
     self._new_contents = new_contents
     self._changed_contents = [(i + 1, l) for i, l in enumerate(new_contents)]
 
   def ChangedContents(self):
     return self._changed_contents
@@ skipping 176 matching lines @@
     mock_output_api = MockOutputApi()
     contents = ['#include <b.h>',
                 '#include <a.h>']
     mock_file_cc = MockFile('something.cc', contents)
     mock_file_h = MockFile('something.h', contents)
     mock_file_other = MockFile('something.py', contents)
     mock_input_api.files = [mock_file_cc, mock_file_h, mock_file_other]
     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 <b.h>',
+                '#include <a.h>']
+    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)
 
 
 class VersionControlerConflictsTest(unittest.TestCase):
   def testTypicalConflict(self):
     lines = ['<<<<<<< HEAD',
              '  base::ScopedTempDir temp_dir_;',
              '=======',
              '  ScopedTempDir temp_dir_;',
              '>>>>>>> master']
     errors = PRESUBMIT._CheckForVersionControlConflictsInFile(
@@ skipping 37 matching lines @@
     mock_input_api.files = [
       MockFile('other/path/qux.h', ''),
       MockFile('other/path/qux.cc', ''),
     ]
     results = PRESUBMIT._CheckPatchFiles(mock_input_api, MockOutputApi())
     self.assertEqual(0, len(results))
 
 
 if __name__ == '__main__':
   unittest.main()