[Zope-Checkins] SVN: Products.Five/branches/1.5/ Merged trunk r74040:74041 into 1.5 branch.

Stefan H. Holek stefan at epy.co.at
Mon Apr 9 10:45:54 EDT 2007


Log message for revision 74046:
  Merged trunk r74040:74041 into 1.5 branch.
  
  Fix test suites.
  

Changed:
  U   Products.Five/branches/1.5/formlib/tests/test_formlib.py
  U   Products.Five/branches/1.5/tests/test_registerpackage.py

-=-
Modified: Products.Five/branches/1.5/formlib/tests/test_formlib.py
===================================================================
--- Products.Five/branches/1.5/formlib/tests/test_formlib.py	2007-04-09 14:33:01 UTC (rev 74045)
+++ Products.Five/branches/1.5/formlib/tests/test_formlib.py	2007-04-09 14:45:53 UTC (rev 74046)
@@ -22,10 +22,10 @@
 def test_suite():
     import unittest
     from Testing.ZopeTestCase import FunctionalDocFileSuite
-    return unittest.TestSuite(
+    return unittest.TestSuite((
         FunctionalDocFileSuite(
-            'formlib.txt', package='Products.Five.formlib.tests')
-        )
+            'formlib.txt', package='Products.Five.formlib.tests'),
+        ))
 
 if __name__ == '__main__':
     framework()

Modified: Products.Five/branches/1.5/tests/test_registerpackage.py
===================================================================
--- Products.Five/branches/1.5/tests/test_registerpackage.py	2007-04-09 14:33:01 UTC (rev 74045)
+++ Products.Five/branches/1.5/tests/test_registerpackage.py	2007-04-09 14:45:53 UTC (rev 74046)
@@ -77,10 +77,9 @@
 
 
 def test_suite():
-    from zope.testing.doctest import DocTestSuite
-    return DocTestSuite()
-    #from Testing.ZopeTestCase import ZopeDocTestSuite
-    #return ZopeDocTestSuite()
+    # Must use functional because registerPackage commits
+    from Testing.ZopeTestCase import FunctionalDocTestSuite
+    return FunctionalDocTestSuite()
 
 if __name__ == '__main__':
     framework()



More information about the Zope-Checkins mailing list