summaryrefslogtreecommitdiff
path: root/setuptools/command
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-12-08 04:18:57 -0500
committerGitHub <noreply@github.com>2016-12-08 04:18:57 -0500
commit4624f204a49b5c401548b3eb49fc5a411d5e095e (patch)
tree2e23a0fd9cfd42596828fee243e6dd4ba840d632 /setuptools/command
parent1474cf0f7e2b973eb102aef311939228b83e31b6 (diff)
parent53b47e1dfa9dfb1e8b94172a4650409fc03d4048 (diff)
downloadpython-setuptools-git-4624f204a49b5c401548b3eb49fc5a411d5e095e.tar.gz
Merge pull request #873 from scop/issue-850
Tell unittest.main not to exit, fixes #850.
Diffstat (limited to 'setuptools/command')
-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