[Python-checkins] python/dist/src/Lib/test test_email.py,1.26,1.27

[bwarsaw@sourceforge.net]

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

Modified Files:
	test_email.py 
Log Message:
test_main(): Added this so the test can actually get run under the
regrtest framework.  Keep the original standalone-unittest
scaffolding (i.e. suite() and __main__).


Index: test_email.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_email.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** test_email.py	10 Apr 2002 21:01:31 -0000	1.26
--- test_email.py	15 Apr 2002 22:11:55 -0000	1.27
***************
*** 30,35 ****
--- 30,37 ----
  from email import quopriMIME
  
+ import test_support
  from test_support import findfile, __file__ as test_support_file
  
+ 
  NL = '\n'
  EMPTYSTRING = ''
***************
*** 1574,1599 ****
  
  
  def suite():
      suite = unittest.TestSuite()
!     suite.addTest(unittest.makeSuite(TestMessageAPI))
!     suite.addTest(unittest.makeSuite(TestEncoders))
!     suite.addTest(unittest.makeSuite(TestLongHeaders))
!     suite.addTest(unittest.makeSuite(TestFromMangling))
!     suite.addTest(unittest.makeSuite(TestMIMEAudio))
!     suite.addTest(unittest.makeSuite(TestMIMEImage))
!     suite.addTest(unittest.makeSuite(TestMIMEText))
!     suite.addTest(unittest.makeSuite(TestMultipartMixed))
!     suite.addTest(unittest.makeSuite(TestNonConformant))
!     suite.addTest(unittest.makeSuite(TestRFC2047))
!     suite.addTest(unittest.makeSuite(TestMIMEMessage))
!     suite.addTest(unittest.makeSuite(TestIdempotent))
!     suite.addTest(unittest.makeSuite(TestMiscellaneous))
!     suite.addTest(unittest.makeSuite(TestIterators))
!     suite.addTest(unittest.makeSuite(TestParsers))
!     suite.addTest(unittest.makeSuite(TestBase64))
!     suite.addTest(unittest.makeSuite(TestQuopri))
!     suite.addTest(unittest.makeSuite(TestHeader))
!     suite.addTest(unittest.makeSuite(TestCharset))
      return suite
  
  
--- 1576,1594 ----
  
  
+ def _testclasses():
+     mod = sys.modules[__name__]
+     return [getattr(mod, name) for name in dir(mod) if name.startswith('Test')]
+ 
+ 
  def suite():
      suite = unittest.TestSuite()
!     for testclass in _testclasses():
!         suite.addTest(unittest.makeSuite(testclass))
      return suite
+ 
+ 
+ def test_main():
+     for testclass in _testclasses():
+         test_support.run_unittest(testclass)