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

This reverts commit 6e9b32254e190201690172c66d9bf2860f9ae80d.
---
 plone/app/discussion/tests/profile/workflows.xml | 5 +++++
 plone/app/discussion/tests/test_acquisition.py   | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plone/app/discussion/tests/profile/workflows.xml b/plone/app/discussion/tests/profile/workflows.xml
index 500f444..3bc5bbf 100644
--- a/plone/app/discussion/tests/profile/workflows.xml
+++ b/plone/app/discussion/tests/profile/workflows.xml
@@ -1,4 +1,9 @@
 <?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 e101c57..9de61d4 100644
--- a/plone/app/discussion/tests/test_acquisition.py
+++ b/plone/app/discussion/tests/test_acquisition.py
@@ -41,12 +41,6 @@ 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(