cleanup, use functional, where commits are involved

plone · Feb 14, 2014 · 7d6bc84 · 7d6bc84
1 parent da01124
commit 7d6bc84
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/plone/app/event/at/tests/test_upgrades.py b/plone/app/event/at/tests/test_upgrades.py
@@ -6,7 +6,7 @@
 from plone.app.event.at.content import ATEvent
 from plone.app.event.at.content import ATEventSchema
 from plone.app.event.at.upgrades.event import upgrade_step_1
-from plone.app.event.testing import PAEventAT_INTEGRATION_TESTING
+from plone.app.event.testing import PAEventAT_FUNCTIONAL_TESTING
 from plone.app.testing import TEST_USER_ID
 from plone.app.testing import setRoles
 from plone.event.interfaces import IEvent
@@ -48,7 +48,7 @@ class MockATEvent_2(ATEvent):
 
 
 class PAEventATMigrationTest(unittest.TestCase):
-    layer = PAEventAT_INTEGRATION_TESTING
+    layer = PAEventAT_FUNCTIONAL_TESTING
 
     def setUp(self):
         portal = self.layer['portal']

diff --git a/plone/app/event/testing.py b/plone/app/event/testing.py
@@ -174,5 +174,3 @@ def setUpPloneSite(self, portal):
 PAEventDX_ROBOT_TESTING = FunctionalTesting(
     bases=(PAEventDX_FIXTURE, AUTOLOGIN_LIBRARY_FIXTURE, z2.ZSERVER_FIXTURE),
     name="plone.app.event.dx:Robot")
-
-
diff --git a/plone/app/event/tests/test_recurrence.py b/plone/app/event/tests/test_recurrence.py
@@ -8,7 +8,6 @@
 from plone.app.event.testing import PAEventAT_FUNCTIONAL_TESTING
 from plone.app.event.testing import PAEventDX_FUNCTIONAL_TESTING
 from plone.app.event.testing import PAEventAT_INTEGRATION_TESTING
-from plone.app.event.testing import PAEventDX_INTEGRATION_TESTING
 from plone.app.event.testing import PAEvent_INTEGRATION_TESTING
 from plone.app.event.testing import set_browserlayer
 from plone.app.event.tests.base_setup import AbstractSampleDataEvents