mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-15 22:30:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue 10611. SystemExit should not cause a unittest test run to exit.

Browse source
This commit is contained in:
Michael Foord 2010-12-19 14:53:19 +00:00
parent 5657ff8aa0
commit a17f076f61
3 changed files with 66 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/unittest/case.py
View file

@ -311,11 +311,15 @@ class TestCase(object):
self.setUp()
except SkipTest as e:
self._addSkip(result, str(e))
except Exception:
except KeyboardInterrupt:
raise
except:
result.addError(self, sys.exc_info())
else:
try:
testMethod()
except KeyboardInterrupt:
raise
except self.failureException:
result.addFailure(self, sys.exc_info())
except _ExpectedFailure as e:
@ -336,14 +340,16 @@ class TestCase(object):
result.addFailure(self, sys.exc_info())
except SkipTest as e:
self._addSkip(result, str(e))
except Exception:
except:
result.addError(self, sys.exc_info())
else:
success = True
try:
self.tearDown()
except Exception:
except KeyboardInterrupt:
raise
except:
result.addError(self, sys.exc_info())
success = False
@ -367,7 +373,9 @@ class TestCase(object):
function, args, kwargs = self._cleanups.pop(-1)
try:
function(*args, **kwargs)
except Exception:
except KeyboardInterrupt:
raise
except:
ok = False
result.addError(self, sys.exc_info())
return ok