Merge pull request #22 from plone/tomgross-noptc

Ported to plone.app.testing

CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-1.3.9 (unreleased)
+2.0 (unreleased)
 ------------------
 
 - Add upgrade step for the security control panel.
@@ -13,6 +13,11 @@ Changelog
 - Add upgrade steps for markup control panel.
   [thet]
 
+- Ported tests to plone.app.testing
+  [tomgross]
+
+- Removed all tests for migrations older than 4.3 -> 5.0
+  [tomgross]
 
 1.3.8 (2014-11-01)
 ------------------

plone/app/upgrade/tests/base.py

@@ -9,19 +9,14 @@
 import transaction
 from zope.site.hooks import setSite
 
-from Testing.ZopeTestCase.sandbox import Sandboxed
-from Products.PloneTestCase.layer import PloneSiteLayer
-from Products.PloneTestCase.ptc import PloneTestCase
-from Products.PloneTestCase.ptc import setupPloneSite
+from plone.app.testing.bbb import PloneTestCase
 
 from Products.CMFCore.interfaces import IActionCategory
 from Products.CMFCore.interfaces import IActionInfo
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.tests.base.testcase import WarningInterceptor
 from Products.GenericSetup.context import TarballImportContext
 
-setupPloneSite()
-
 
 class MigrationTest(PloneTestCase):
 
@@ -111,21 +106,10 @@ def removeSkinLayer(self, layer, skin='Plone Default'):
             skins.addSkinSelection(skin, ','.join(path))
 
 
-class FunctionalUpgradeLayer(PloneSiteLayer):
-
-    @classmethod
-    def setUp(cls):
-        pass
-
-    @classmethod
-    def tearDown(cls):
-        pass
-
 
-class FunctionalUpgradeTestCase(Sandboxed, PloneTestCase, WarningInterceptor):
+class FunctionalUpgradeTestCase(PloneTestCase, WarningInterceptor):
 
     _setup_fixture = 0
-    layer = FunctionalUpgradeLayer
     site_id = 'test'
 
     def afterSetUp(self):