From 6e9b32254e190201690172c66d9bf2860f9ae80d Mon Sep 17 00:00:00 2001
From: Kees Hink <keeshink@gmail.com>
Date: Fri, 10 May 2013 13:26:30 +0200
Subject: [PATCH] Move application of custom workflow to test_acquisition.py...

...so it doesn't interfere with other test in the layer.
---
 plone/app/discussion/tests/profile/workflows.xml | 5 -----
 plone/app/discussion/tests/test_acquisition.py   | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plone/app/discussion/tests/profile/workflows.xml b/plone/app/discussion/tests/profile/workflows.xml
index 3bc5bbf..500f444 100644
--- a/plone/app/discussion/tests/profile/workflows.xml
+++ b/plone/app/discussion/tests/profile/workflows.xml
@@ -1,9 +1,4 @@
 <?xml version="1.0"?>
 <object name="portal_workflow" meta_type="CMF Workflow Tool">
  <object name="comment_workflow_acquired_view" meta_type="Workflow"/>
- <bindings>
-  <type type_id="Discussion Item">
-   <bound-workflow workflow_id="comment_workflow_acquired_view"/>
-  </type>
- </bindings>
 </object>
diff --git a/plone/app/discussion/tests/test_acquisition.py b/plone/app/discussion/tests/test_acquisition.py
index 9de61d4..e101c57 100644
--- a/plone/app/discussion/tests/test_acquisition.py
+++ b/plone/app/discussion/tests/test_acquisition.py
@@ -41,6 +41,12 @@ class DexterityAcquisitionTest(unittest.TestCase):
         setRoles(self.portal, TEST_USER_ID, ['Manager'])
         self.wftool = getToolByName(self.portal, 'portal_workflow')
 
+        # Use customized workflow for comments.
+        self.wftool.setChainForPortalTypes(
+            ['Discussion Item'],
+            (comment_workflow_acquired_view,),
+        )
+
         # Use one_state_workflow for Document and sample_content_type,
         # so they're always published.
         self.wftool.setChainForPortalTypes(