From 45afdfc681f2daa41a8adc6606a4d19c6fa3abeb Mon Sep 17 00:00:00 2001 From: Maurits van Rees Date: Fri, 28 Sep 2018 11:15:52 +0200 Subject: [PATCH] Made the bbb_at imports conditional. Fall back to plone.app.testing.bbb, needed in plone.app.testing 5 or earlier. https://github.com/plone/Products.Archetypes/pull/111 --- Products/Archetypes/tests/attestcase.py | 6 +++++- .../Archetypes/tests/test_date_components_support_script.py | 6 +++++- Products/Archetypes/tests/test_interfaces.py | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Products/Archetypes/tests/attestcase.py b/Products/Archetypes/tests/attestcase.py index 96756869..a7396d7e 100644 --- a/Products/Archetypes/tests/attestcase.py +++ b/Products/Archetypes/tests/attestcase.py @@ -1,4 +1,8 @@ -from plone.app.testing import bbb_at +try: + from plone.app.testing import bbb_at +except ImportError: + # plone.app.testing 5 or earlier + from plone.app.testing import bbb as bbb_at from plone.app.testing import FunctionalTesting, applyProfile from Products.GenericSetup import EXTENSION, profile_registry diff --git a/Products/Archetypes/tests/test_date_components_support_script.py b/Products/Archetypes/tests/test_date_components_support_script.py index cc310102..c1465673 100644 --- a/Products/Archetypes/tests/test_date_components_support_script.py +++ b/Products/Archetypes/tests/test_date_components_support_script.py @@ -1,5 +1,9 @@ # -*- coding: utf-8 -*- -from plone.app.testing.bbb_at import PloneTestCase +try: + from plone.app.testing.bbb_at import PloneTestCase +except ImportError: + # plone.app.testing 5 or earlier + from plone.app.testing.bbbt import PloneTestCase from DateTime import DateTime diff --git a/Products/Archetypes/tests/test_interfaces.py b/Products/Archetypes/tests/test_interfaces.py index c3d2c1e8..be03a42c 100644 --- a/Products/Archetypes/tests/test_interfaces.py +++ b/Products/Archetypes/tests/test_interfaces.py @@ -48,7 +48,11 @@ StorageLayer, AttributeStorage, ObjectManagedStorage, MetadataStorage from Products.Archetypes.atapi import registerType -from plone.app.testing.bbb_at import PTC_FUNCTIONAL_TESTING +try: + from plone.app.testing.bbb_at import PTC_FUNCTIONAL_TESTING +except ImportError: + # plone.app.testing 5 or earlier + from plone.app.testing.bbb import PTC_FUNCTIONAL_TESTING def className(klass):