[Checkins] SVN: Products.CMFCalendar/trunk/Products/CMFCalendar/ Adjusted test layer setup to work with Zope 2.13.0a2.

[Hanno Schlichting]

Log message for revision 114569:
  Adjusted test layer setup to work with Zope 2.13.0a2.
  

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2010-07-11 10:39:04 UTC (rev 114568)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/CHANGES.txt	2010-07-11 10:43:52 UTC (rev 114569)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Adjusted test layer setup to work with Zope 2.13.0a2.
+
 - Deal with deprecation warnings for Zope 2.13.
 
 - Fixed ViewPageTemplateFile import to use the correct version from Five.

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py	2010-07-11 10:39:04 UTC (rev 114568)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py	2010-07-11 10:43:52 UTC (rev 114569)
@@ -38,11 +38,19 @@
         import Products.CMFCalendar
         import Products.CMFDefault
         import Products.DCWorkflow
+        import OFS
 
         zcml.load_config('configure.zcml', Products.CMFCalendar)
         zcml.load_config('configure.zcml', Products.CMFDefault)
         zcml.load_config('configure.zcml', Products.DCWorkflow)
 
+        try:
+            zcml.load_config('meta.zcml', OFS)
+            zcml.load_config('configure.zcml', OFS)
+        except IOError:  # Zope <= 2.13.0a2
+            pass
+        ZopeTestCase.installPackage('OFS')
+
         app = ZopeTestCase.app()
         addConfiguredSite(app, 'site', 'Products.CMFDefault:default',
                           snapshot=False,
@@ -57,4 +65,3 @@
         app._delObject('site')
         transaction.commit()
         ZopeTestCase.close(app)
-