From 252b85e7960bbf515fc9236f7b9b54d4026a4f51 Mon Sep 17 00:00:00 2001 From: David Glick Date: Thu, 16 Feb 2017 22:47:07 -0800 Subject: [PATCH] fix test layer ordering --- CHANGES.rst | 3 +++ plone/app/discussion/testing.py | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index c9d0d2c..84c1f8f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -45,6 +45,9 @@ Bug fixes: - Remove unittest2 dependency [kakshay21] +- Make sure the effects of the robotframework REMOTE_LIBRARY_ROBOT_TESTING fixture + are not accidentally removed when tearing down the PLONE_APP_DISCUSSION_ROBOT_TESTING fixture. + [davisagli] 3.0.0 (2017-02-12) diff --git a/plone/app/discussion/testing.py b/plone/app/discussion/testing.py index 4280a6e..a7c439a 100644 --- a/plone/app/discussion/testing.py +++ b/plone/app/discussion/testing.py @@ -98,6 +98,11 @@ class PloneAppDiscussion(PloneSandboxLayer): class PloneAppDiscussionRobot(PloneAppDiscussion): + defaultBases = ( + PLONE_APP_CONTENTTYPES_FIXTURE, + REMOTE_LIBRARY_ROBOT_TESTING, + ) + def setUpPloneSite(self, portal): registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings) @@ -113,9 +118,6 @@ PLONE_APP_DISCUSSION_FUNCTIONAL_TESTING = FunctionalTesting( bases=(PLONE_APP_DISCUSSION_FIXTURE,), name='PloneAppDiscussion:Functional') PLONE_APP_DISCUSSION_ROBOT_TESTING = FunctionalTesting( - bases=( - PLONE_APP_DISCUSSION_ROBOT_FIXTURE, - REMOTE_LIBRARY_ROBOT_TESTING - ), + bases=(PLONE_APP_DISCUSSION_ROBOT_FIXTURE,), name='PloneAppDiscussion:Robot' )