From 252b85e7960bbf515fc9236f7b9b54d4026a4f51 Mon Sep 17 00:00:00 2001
From: David Glick <david@glicksoftware.com>
Date: Thu, 16 Feb 2017 22:47:07 -0800
Subject: [PATCH 1/2] 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'
 )

From 90ba992f729d6337ef9194ca3b8233300c746c0e Mon Sep 17 00:00:00 2001
From: Philip Bauer <bauer@starzel.de>
Date: Mon, 18 Sep 2017 12:14:11 +0200
Subject: [PATCH 2/2] fix changelog

---
 CHANGES.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 84c1f8f..bf3c4a9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,7 +14,9 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- 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.3 (2017-08-27)
@@ -45,9 +47,6 @@ 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)