[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/Five/ Fix test suites.

[Stefan H. Holek]

Log message for revision 74041:
  Fix test suites.
  

Changed:
  U   Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py
  U   Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py

-=-
Modified: Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py	2007-04-08 13:36:44 UTC (rev 74040)
+++ Zope/trunk/lib/python/Products/Five/formlib/tests/test_formlib.py	2007-04-08 19:46:09 UTC (rev 74041)
@@ -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: Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py	2007-04-08 13:36:44 UTC (rev 74040)
+++ Zope/trunk/lib/python/Products/Five/tests/test_registerpackage.py	2007-04-08 19:46:09 UTC (rev 74041)
@@ -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()