[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/test - fixed Zope 2.11 testing

Yvo Schubbe y.2008 at wcm-solutions.de
Wed Feb 27 15:24:04 EST 2008


Log message for revision 84353:
  - fixed Zope 2.11 testing

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/testing.py
  U   Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/testing.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/testing.py	2008-02-27 20:02:32 UTC (rev 84352)
+++ Products.GenericSetup/trunk/Products/GenericSetup/testing.py	2008-02-27 20:24:03 UTC (rev 84353)
@@ -161,6 +161,15 @@
         cleanUp()
 
 
+# Derive from ZopeLite layer if available
+try:
+    from Testing.ZopeTestCase.layer import ZopeLite
+except ImportError:
+    pass # Zope < 2.11
+else:
+    ExportImportZCMLLayer.__bases__ = (ZopeLite,)
+
+
 def run(test_suite):
     options = testrunner.get_options()
     options.resume_layer = None

Modified: Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py	2008-02-27 20:02:32 UTC (rev 84352)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tests/test_utils.py	2008-02-27 20:24:03 UTC (rev 84353)
@@ -23,6 +23,7 @@
 from OFS.interfaces import IItem
 from OFS.SimpleItem import Item
 from Products.Five.utilities.marker import MarkerInterfacesAdapter
+from Testing.ZopeTestCase import ZopeTestCase
 from zope.component import provideAdapter
 from zope.component.interface import provideInterface
 from zope.interface import directlyProvides
@@ -470,7 +471,7 @@
         self.assertEqual(doc.toprettyxml(' '), _NORMAL_MARKER_EXPORT)
 
 
-class ObjectManagerHelpersTests(unittest.TestCase):
+class ObjectManagerHelpersTests(ZopeTestCase):
 
     def _getTargetClass(self):
         from Products.GenericSetup.utils import ObjectManagerHelpers



More information about the Checkins mailing list