PEP8 line length limits applied to stderr messages

Messages formatting using .format() methods

Tests over error messages for invalid --spool arguments

Related to: joeyespo#79 (review)

Author: suggiro

pytest_watch/command.py

@@ -105,11 +105,14 @@ def main(argv=None):
     try:
         spool = int(spool)
     except ValueError:
-        sys.stderr.write('Error: Spool (--spool %s) must be an integer.\n' % spool)
+        sys.stderr.write('Error: Spool (--spool {}) must be an integer.\n'
+                         .format(spool))
         return 2
 
     if spool < 0:
-        sys.stderr.write("Error: Spool value(--spool %s) must be positive integer" % spool)
+        sys.stderr.write('Error: Spool value(--spool {}) must be positive'\
+                         ' integer\n'
+                         .format(spool))
         return 2
 
     # Run pytest and watch for changes

pytest_watch/tests/test_command.py

@@ -3,6 +3,11 @@
 import shutil
 import tempfile
 
+if sys.version_info[0] < 3:
+    from io import BytesIO as io_mock
+else:
+    from io import StringIO as io_mock
+
 try:
     from unittest.mock import patch
 except ImportError:
@@ -97,7 +102,8 @@ def test_pdb_off_and_wait_on_arguments(self, watch_callee):
                          watch_callee.call_args[1]["pytest_args"])
 
 
-@patch("pytest_watch.command.merge_config", side_effect=lambda *args, **kwargs: True)
+@patch("pytest_watch.command.merge_config",
+       side_effect=lambda *args, **kwargs: True)
 @patch("pytest_watch.command.watch", side_effect=lambda *args, **kwargs: 0)
 class TestConfigArgument(unittest.TestCase):
     def test_default_config(self, watch_callee, merge_config_callee):
@@ -226,20 +232,32 @@ def test_default_spool_value(self, watch_callee):
         self.assertEqual(200, watch_callee.call_args[1]["spool"])
         watch_callee.assert_called_once()
 
-    def test_cause_error_for_negative_spool_values(self, watch_callee):
-        self.assertEqual(2, main("--spool -1".split()))
+    def _assert_spool_error(self, watch_callee, value, err):
+        with patch("pytest_watch.command.sys.stderr", new=io_mock()) as out:
+            self.assertEqual(2, main(["--spool", value]))
+            assert err  == out.getvalue(), \
+                   "Status code for invalid 'spool' argument should be 2"
         watch_callee.assert_not_called()
 
+    def test_cause_error_for_negative_spool_values(self, watch_callee):
+        err = "Error: Spool value(--spool -1) must be positive integer\n"
+        self._assert_spool_error(watch_callee, value="-1", err=err)
+
     def test_cause_error_for_invalid_spool_values(self, watch_callee):
-        self.assertEquals(2, main("--spool abc".split()),
-                          "Status code for not integer 'spool' " \
-                          "argument should be 2")
-        self.assertEquals(2, main("--spool @".split()),
-                          "Status code for not integer 'spool' " \
-                          "argument should be 2")
-        self.assertEquals(2, main("--spool []".split()),
-                          "Status code for not integer 'spool' " \
-                          "argument should be 2")
+        value = "abc"
+        self._assert_spool_error(watch_callee, value=value,
+                                 err="Error: Spool (--spool {}) must be" \
+                                     " an integer.\n".format(value))
+
+        value = "@"
+        self._assert_spool_error(watch_callee, value=value,
+                                 err="Error: Spool (--spool {}) must be" \
+                                     " an integer.\n".format(value))
+
+        value = "[]"
+        self._assert_spool_error(watch_callee, value=value,
+                                 err="Error: Spool (--spool {}) must be" \
+                                     " an integer.\n".format(value))
 
 
 @patch("pytest_watch.command.watch", side_effect=lambda *args, **kwargs: 0)

pytest_watch/tests/test_main.py

@@ -13,8 +13,7 @@
 
 class TestRunCLI(unittest.TestCase):
 
-    @patch("pytest_watch.command.main", side_effect=lambda argv: 0)
+    @patch("pytest_watch.command.main", side_effect=lambda argv=None: 0)
     def test_add_pytest_watch_folder_to_path(self, main):
         run_cli()
-        self.assertIn(os.path.dirname(__main__.__file__), sys.path)
-
+        assert os.path.dirname(__main__.__file__) in sys.path