Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Remove exc_info() kludge -- it actually messed up the Jython output

Browse source 
* Fixed TestLoader.loadTestsFromName() for nested packages
* Corrected the command-line usage summary
This commit is contained in:
Steve Purcell 2001-04-09 15:37:31 +00:00
parent a36f4a0cd6
commit 17a781bc69
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/unittest.py
View file

@ -189,7 +189,7 @@ def __call__(self, result=None):
try:
self.setUp()
except:
result.addError(self,self.__exc_info())
result.addError(self,sys.exc_info())
return
ok = 0
@ -197,14 +197,14 @@ def __call__(self, result=None):
testMethod()
ok = 1
except AssertionError, e:
result.addFailure(self,self.__exc_info())
result.addFailure(self,sys.exc_info())
except:
result.addError(self,self.__exc_info())
result.addError(self,sys.exc_info())
try:
self.tearDown()
except:
result.addError(self,self.__exc_info())
result.addError(self,sys.exc_info())
ok = 0
if ok: result.addSuccess(self)
finally:
@ -266,17 +266,6 @@ def fail(self, msg=None):
"""Fail immediately, with the given message."""
raise AssertionError, msg
def __exc_info(self):
"""Return a version of sys.exc_info() with the traceback frame
minimised; usually the top level of the traceback frame is not
needed.
"""
exctype, excvalue, tb = sys.exc_info()
newtb = tb.tb_next
if newtb is None:
return (exctype, excvalue, tb)
return (exctype, excvalue, newtb)
class TestSuite:
"""A test suite is a composite test consisting of a number of TestCases.
@ -400,7 +389,14 @@ def loadTestsFromName(self, name, module=None):
if not parts:
raise ValueError, "incomplete test name: %s" % name
else:
module = __import__(parts)
parts_copy = parts[:]
while parts_copy:
try:
module = __import__(string.join(parts_copy,'.'))
break
except ImportError:
del parts_copy[-1]
if not parts_copy: raise
parts = parts[1:]
obj = module
for part in parts:
@ -599,7 +595,7 @@ class TestProgram:
for making test modules conveniently executable.
"""
USAGE = """\
Usage: %(progName)s [options] [test[:(casename|prefix-)]] [...]
Usage: %(progName)s [options] [test] [...]
Options:
-h, --help Show this message