- In test-setup, explicitly install DateRecurringIndex instead of ext…

…ending

  it's test layer fixture. This should finally fix #81, where other tests
  couldn't be run when not extending the DRI or PAE test fixture layers.

CHANGES.rst

@@ -4,6 +4,11 @@ Changelog
 1.0dev (unreleased)
 -------------------
 
+- In test-setup, explicitly install DateRecurringIndex instead of extending
+  it's test layer fixture. This should finally fix #81, where other tests
+  couldn't be run when not extending the DRI or PAE test fixture layers.
+  [thet]
+
 - Support the @@images view for IOccurrence objects by using a factory, which
   returns a AT or DX specific view depending on the Occurrence's parent. 
   [thet]

plone/app/event/testing.py

@@ -1,4 +1,3 @@
-from Products.DateRecurringIndex.testing import DRI_FIXTURE
 from plone.app.event.interfaces import IBrowserLayer
 from plone.app.event.interfaces import IEventSettings
 from plone.app.testing import IntegrationTesting
@@ -43,12 +42,15 @@ def os_zone():
 
 
 class PAEventLayer(PloneSandboxLayer):
-    defaultBases = (DRI_FIXTURE, PLONE_FIXTURE,)
+    defaultBases = (PLONE_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
         # store original TZ, for the case it's overwritten
         self.ostz = os_zone()
 
+        # Install products that use an old-style initialize() function
+        z2.installProduct(app, 'Products.DateRecurringIndex')
+
         # Load ZCML
         import plone.app.event
         self.loadZCML(package=plone.app.event, context=configurationContext)
@@ -58,12 +60,16 @@ def setUpPloneSite(self, portal):
         set_timezone(tz='UTC')
 
     def tearDownZope(self, app):
+        # Uninstall old-style Products
+        z2.uninstallProduct(app, 'Products.DateRecurringIndex')
+
         # reset OS TZ
         if self.ostz:
             os.environ['TZ'] = self.ostz
         elif 'TZ' in os.environ:
             del os.environ['TZ']
 
+
 PAEvent_FIXTURE = PAEventLayer()
 PAEvent_INTEGRATION_TESTING = IntegrationTesting(
     bases=(PAEvent_FIXTURE,),