[Checkins] SVN: Products.GenericSetup/branches/1.3/Products/GenericSetup/test Merge changeset 84353 from trunk: fix Zope 2.11 testing.

[Maurits van Rees]

Log message for revision 84380:
  Merge changeset 84353 from trunk: fix Zope 2.11 testing.

Changed:
  U   Products.GenericSetup/branches/1.3/Products/GenericSetup/testing.py
  U   Products.GenericSetup/branches/1.3/Products/GenericSetup/tests/test_utils.py

-=-
Modified: Products.GenericSetup/branches/1.3/Products/GenericSetup/testing.py
===================================================================
--- Products.GenericSetup/branches/1.3/Products/GenericSetup/testing.py	2008-02-29 12:48:57 UTC (rev 84379)
+++ Products.GenericSetup/branches/1.3/Products/GenericSetup/testing.py	2008-02-29 21:22:42 UTC (rev 84380)
@@ -154,6 +154,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/branches/1.3/Products/GenericSetup/tests/test_utils.py
===================================================================
--- Products.GenericSetup/branches/1.3/Products/GenericSetup/tests/test_utils.py	2008-02-29 12:48:57 UTC (rev 84379)
+++ Products.GenericSetup/branches/1.3/Products/GenericSetup/tests/test_utils.py	2008-02-29 21:22:42 UTC (rev 84380)
@@ -19,7 +19,7 @@
 import Testing
 
 from xml.dom.minidom import parseString
-
+from Testing.ZopeTestCase import ZopeTestCase
 from Products.GenericSetup.utils import PrettyDocument
 from Products.GenericSetup.testing import DummySetupEnviron
 
@@ -148,7 +148,7 @@
 _ADD_IMPORT = """\
 <?xml version="1.0"?>
 <dummy>
- <object name="history" meta_type="Folder"/>
+ <object name="history" meta_type="FolderMaurits"/>
 </dummy>
 """
 _REMOVE_IMPORT = """\
@@ -396,7 +396,7 @@
         self.assertEquals(obj.lines3, ('Gee', 'Foo', 'Bar'))
 
 
-class ObjectManagerHelpersTests(unittest.TestCase):
+class ObjectManagerHelpersTests(ZopeTestCase):
 
     def _getTargetClass(self):
         from Products.GenericSetup.utils import ObjectManagerHelpers