[Python-checkins] CVS: python/dist/src/Lib/test test_support.py,1.27,1.28

Tim Peters tim_one@users.sourceforge.net
Fri, 07 Sep 2001 20:37:58 -0700


Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv21374

Modified Files:
	test_support.py 
Log Message:
It appears that unittest was changed to stop hoarding raw exception data,
saving instead a traceback string, but test_support's run_unittest was
still peeking into unittest internals and trying to pick apart unittest's
errors and failures vectors as if they contained exc_info() tuples instead
of strings.
Whatever, when a unittest-based test failed, test_support blew up.  I'm
not sure this is the right way to fix it; it simply gets me unstuck.


Index: test_support.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** test_support.py	2001/09/06 16:09:41	1.27
--- test_support.py	2001/09/08 03:37:56	1.28
***************
*** 156,161 ****
              raise TestFailed("errors occurred in %s.%s"
                               % (testclass.__module__, testclass.__name__))
!         if err[0] is AssertionError:
!             raise TestFailed(str(err[1]))
!         else:
!             raise TestFailed("%s: %s" % err[:2])
--- 156,158 ----
              raise TestFailed("errors occurred in %s.%s"
                               % (testclass.__module__, testclass.__name__))
!         raise TestFailed(err)