diff --git a/plone/app/upgrade/v50/testing.py b/plone/app/upgrade/v50/testing.py index e258aa16..f95b84c9 100644 --- a/plone/app/upgrade/v50/testing.py +++ b/plone/app/upgrade/v50/testing.py @@ -2,6 +2,7 @@ from plone.app.testing import PLONE_FIXTURE from plone.app.testing import PloneSandboxLayer from plone.app.upgrade.utils import loadMigrationProfile +from plone.app.upgrade.utils import plone_version from plone.testing.z2 import FunctionalTesting from plone.testing.z2 import login from zope.component.hooks import setSite @@ -40,7 +41,7 @@ def setUpPloneSite(self, portal): # run upgrades self['portal'] = portal = app.test setSite(portal) - if get_distribution('Products.CMFPlone').version >= '5.2': + if plone_version >= '5.2': # for 5.2 we need tools as utilities loadMigrationProfile( portal.portal_setup, diff --git a/plone/app/upgrade/v52/tests.py b/plone/app/upgrade/v52/tests.py index a693e22c..e8fcd1b2 100644 --- a/plone/app/upgrade/v52/tests.py +++ b/plone/app/upgrade/v52/tests.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- -from plone.app.upgrade.v52.testing import REAL_UPGRADE_FUNCTIONAL from plone.testing.z2 import Browser -from pkg_resources import get_distribution import unittest