aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/test.py
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2016-12-07 15:00:43 +0200
committerVille Skyttä <ville.skytta@iki.fi>2016-12-07 18:17:49 +0200
commit53b47e1dfa9dfb1e8b94172a4650409fc03d4048 (patch)
tree9a2d9a50a09eb62f1d964ec41b15e4df3ceeaca3 /setuptools/command/test.py
parentc4df6d7197a0e56ead10a1b1c0dbc81ea4a36615 (diff)
downloadexternal_python_setuptools-53b47e1dfa9dfb1e8b94172a4650409fc03d4048.tar.gz
external_python_setuptools-53b47e1dfa9dfb1e8b94172a4650409fc03d4048.tar.bz2
external_python_setuptools-53b47e1dfa9dfb1e8b94172a4650409fc03d4048.zip
Tell unittest.main not to exit, fixes #850.
Diffstat (limited to 'setuptools/command/test.py')
-rw-r--r--setuptools/command/test.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 270674e2..9a5117be 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -225,10 +225,12 @@ class test(Command):
del_modules.append(name)
list(map(sys.modules.__delitem__, del_modules))
+ exit_kwarg = {} if sys.version_info < (2, 7) else {"exit": False}
unittest_main(
None, None, self._argv,
testLoader=self._resolve_as_ep(self.test_loader),
testRunner=self._resolve_as_ep(self.test_runner),
+ **exit_kwarg
)
@property