Update of /cvsroot/happydoc/HappyDoc
In directory usw-pr-cvs1:/tmp/cvs-serv15591
Modified Files:
test_happydoc.py
Log Message:
Handle test cases which may have support for status message function in constructor.
Index: test_happydoc.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/test_happydoc.py,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** test_happydoc.py 2002/01/19 17:59:02 1.75
--- test_happydoc.py 2002/01/31 13:19:41 1.76
***************
*** 455,460 ****
"""
! def __init__(self, outputDir, knownTestCaseClasses):
self.output_dir = outputDir
self.known_classes = knownTestCaseClasses
return
--- 455,461 ----
"""
! def __init__(self, outputDir, statusMessageFunc, knownTestCaseClasses):
self.output_dir = outputDir
+ self.status_message_func = statusMessageFunc
self.known_classes = knownTestCaseClasses
return
***************
*** 465,478 ****
tests = []
for n in names:
! tests.append( testCaseClass(n, self.output_dir) )
return self.suiteClass(tests)
def loadTestsFromName(self, name, module=None):
try:
! return unittest.TestLoader.loadTestsFromName(self, name, module)
except ImportError:
for checking_class in self.known_classes:
if name in self.getTestCaseNames(checking_class):
! return self.suiteClass([ checking_class(name, self.output_dir) ])
--- 466,493 ----
tests = []
for n in names:
! try:
! test_case = testCaseClass(n,
! outputDir=self.output_dir,
! statusMessageFunc=self.status_message_func,
! )
! except TypeError:
! test_case = testCaseClass(n, outputDir=self.output_dir)
!
! tests.append(test_case)
return self.suiteClass(tests)
def loadTestsFromName(self, name, module=None):
try:
! test_obj = unittest.TestLoader.loadTestsFromName(self, name, module)
! test_obj.status_message_func = self.status_message_func
! return test_obj
except ImportError:
for checking_class in self.known_classes:
if name in self.getTestCaseNames(checking_class):
! return self.suiteClass([
! checking_class(name,
! outputDir=self.output_dir,
! statusMessageFunc=self.status_message_func)
! ])
***************
*** 592,595 ****
--- 607,611 ----
test_loader = HappyDocTestLoader(self._output_dir,
+ self.statusMessage,
(ExecuteHappyDocTest,
ZopeTest,
|
