Merge lp:~adiroiban/pocket-lint/bug-761572 into lp:pocket-lint

[Curtis Hovey]

Return the count of messages, zero indicating no issues.

[Curtis Hovey (sinzui)]

Thank you very much for this patch. I am merging it and intend to release it with version 0.5.14.

review: Approve (curtis)

=== modified file 'pocketlint/formatcheck.py'
--- pocketlint/formatcheck.py	2011-04-17 16:22:10 +0000
+++ pocketlint/formatcheck.py	2011-04-17 16:27:29 +0000
@@ -65,10 +65,12 @@
             self.treestore = self.file_lines_view.get_model()
         self.piter = None
         self._last_file_name = None
+        self.call_count = 0
 
     def __call__(self, line_no, message, icon=None,
                  base_dir=None, file_name=None):
         """Report a message."""
+        self.call_count += 1
         if self.report_type == self.FILE_LINES:
             self._message_file_lines(
                 line_no, message, icon=icon,
@@ -545,6 +547,7 @@
 def check_sources(sources, reporter=None):
     if reporter is None:
         reporter = Reporter(Reporter.CONSOLE)
+    reporter.call_count = 0
     for source in sources:
         file_path = os.path.normpath(source)
         if os.path.isdir(source) or not Language.is_editable(source):
@@ -555,6 +558,7 @@
         checker = UniversalChecker(
             file_path, text=text, language=language, reporter=reporter)
         checker.check()
+    return reporter.call_count
 
 
 def main(argv=None):
@@ -569,7 +573,7 @@
     if options.verbose:
         pass
     reporter = Reporter(Reporter.CONSOLE)
-    check_sources(sources, reporter)
+    return check_sources(sources, reporter)
 
 
 if __name__ == '__main__':

=== modified file 'pocketlint/tests/__init__.py'
--- pocketlint/tests/__init__.py	2011-03-27 18:07:20 +0000
+++ pocketlint/tests/__init__.py	2011-04-17 16:27:29 +0000
@@ -9,10 +9,12 @@
 
     def __init__(self):
         self.messages = []
+        self.call_count = 0
 
     def __call__(self, line_no, message, icon=None,
                  base_dir=None, file_name=None):
         """Report a message."""
+        self.call_count += 1
         self._message_console(
             line_no, message, icon=icon,
             base_dir=base_dir, file_name=file_name)

=== modified file 'pocketlint/tests/test_python.py'
--- pocketlint/tests/test_python.py	2011-04-17 14:41:15 +0000
+++ pocketlint/tests/test_python.py	2011-04-17 16:27:29 +0000
@@ -71,11 +71,14 @@
         self.assertTrue('pocketlint/contrib/' in messages.__file__)
 
     def test_code_without_issues(self):
+        self.reporter.call_count = 0
         checker = PythonChecker('bogus', good_python, self.reporter)
         checker.check_flakes()
         self.assertEqual([], self.reporter.messages)
+        self.assertEqual(0, self.reporter.call_count)
 
     def test_code_with_SyntaxError(self):
+        self.reporter.call_count = 0
         checker = PythonChecker(
             'bogus', bad_syntax_python, self.reporter)
         checker.check_flakes()
@@ -83,6 +86,7 @@
             0, 'Could not compile; non-default argument follows '
                'default argument: ')]
         self.assertEqual(expected, self.reporter.messages)
+        self.assertEqual(1, self.reporter.call_count)
 
     def test_code_with_very_bad_SyntaxError(self):
         checker = PythonChecker(
@@ -102,12 +106,14 @@
         self.assertEqual(expected, self.reporter.messages)
 
     def test_code_with_warnings(self):
+        self.reporter.call_count = 0
         checker = PythonChecker('bogus', ugly_python, self.reporter)
         checker.check_flakes()
         self.assertEqual(
             [(3, "undefined name 'b'"),
             (3, "local variable 'a' is assigned to but never used")],
             self.reporter.messages)
+        self.assertEqual(2, self.reporter.call_count)
 
 
 class TestPEP8(CheckerTestCase):