fix exit_code for click.testing.CliRunner.invoke

.gitignore

@@ -8,3 +8,4 @@ build
 docs/_build
 click.egg-info
 .tox
+.cache

click/testing.py

@@ -1,9 +1,9 @@
+import contextlib
 import os
-import sys
+import shlex
 import shutil
+import sys
 import tempfile
-import contextlib
-import shlex
 
 from ._compat import iteritems, PY2, string_types
 
@@ -197,6 +197,7 @@ def _getchar(echo):
             return char
 
         default_color = color
+
         def should_strip_ansi(stream=None, color=None):
             if color is None:
                 return not default_color
@@ -292,14 +293,19 @@ def invoke(self, cli, args=None, input=None, env=None,
 
                 exit_code = e.code
                 if not isinstance(exit_code, int):
+                    if exit_code is None:
+                        exit_code = 0
+                    else:
+                        exit_code = 1
+
                     sys.stdout.write(str(exit_code))
                     sys.stdout.write('\n')
-                    exit_code = 1
+
             except Exception as e:
                 if not catch_exceptions:
                     raise
                 exception = e
-                exit_code = -1
+                exit_code = 1
                 exc_info = sys.exc_info()
             finally:
                 sys.stdout.flush()

tests/test_testing.py

@@ -171,15 +171,15 @@ def cli_no_error():
 
     result = runner.invoke(cli_string)
     assert result.exit_code == 1
-    assert result.output == 'hello world\nerror\n'
+    assert result.output == 'hello world\n1\n'
 
     result = runner.invoke(cli_int)
     assert result.exit_code == 1
     assert result.output == 'hello world\n'
 
     result = runner.invoke(cli_float)
     assert result.exit_code == 1
-    assert result.output == 'hello world\n1.0\n'
+    assert result.output == 'hello world\n1\n'
 
     result = runner.invoke(cli_no_error)
     assert result.exit_code == 0