diff options
| -rw-r--r-- | PRESUBMIT.py | 9 | ||||
| -rwxr-xr-x | PRESUBMIT_test.py | 17 |
2 files changed, 24 insertions, 2 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index ff620c1..9acfcb28 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -619,8 +619,13 @@ def _CheckIncludeOrder(input_api, output_api): results = [] if warnings: - results.append(output_api.PresubmitPromptWarning(_INCLUDE_ORDER_WARNING, - warnings)) + if not input_api.is_committing: + results.append(output_api.PresubmitPromptWarning(_INCLUDE_ORDER_WARNING, + warnings)) + else: + # We don't warn on commit, to avoid stopping commits going through CQ. + results.append(output_api.PresubmitNotifyResult(_INCLUDE_ORDER_WARNING, + warnings)) return results diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py index 9bc7db5..a8bbc80 100755 --- a/PRESUBMIT_test.py +++ b/PRESUBMIT_test.py @@ -15,6 +15,7 @@ class MockInputApi(object): self.re = re self.os_path = os.path self.files = [] + self.is_committing = False def AffectedFiles(self): return self.files @@ -30,14 +31,17 @@ class MockOutputApi(object): 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): @@ -234,6 +238,19 @@ 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 <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): |