[Checkins] SVN: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/ Backported c114569 from trunk

[Hanno Schlichting]

Log message for revision 114573:
  Backported c114569 from trunk
  

Changed:
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt
  U   Products.CMFCalendar/branches/2.2/Products/CMFCalendar/testing.py

-=-
Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt	2010-07-11 10:53:36 UTC (rev 114572)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/CHANGES.txt	2010-07-11 10:55:06 UTC (rev 114573)
@@ -4,7 +4,9 @@
 2.2.2 (unreleased)
 ------------------
 
+- Adjusted test layer setup to work with Zope 2.13.0a2.
 
+
 2.2.1 (2010-07-04)
 ------------------
 

Modified: Products.CMFCalendar/branches/2.2/Products/CMFCalendar/testing.py
===================================================================
--- Products.CMFCalendar/branches/2.2/Products/CMFCalendar/testing.py	2010-07-11 10:53:36 UTC (rev 114572)
+++ Products.CMFCalendar/branches/2.2/Products/CMFCalendar/testing.py	2010-07-11 10:55:06 UTC (rev 114573)
@@ -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)
-