From 1fd8234388fb0e5081db77c6610e6fc3fd5946e5 Mon Sep 17 00:00:00 2001
From: Wenjie Zheng <wenjie.zheng@tiolive.com>
Date: Thu, 14 May 2015 09:27:34 +0000
Subject: [PATCH] testWorkflowAndDCWorkflow: fix incorrect workflow names
 appear in the live test.

---
 .../portal_components/test.erp5.testWorkflowAndDCWorkflow.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bt5/erp5_workflow_test_data/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py b/bt5/erp5_workflow_test_data/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py
index 4cb2287dfb..326feea90e 100644
--- a/bt5/erp5_workflow_test_data/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py
+++ b/bt5/erp5_workflow_test_data/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py
@@ -219,7 +219,7 @@ class TestERP5Workflow(TestERP5WorkflowMixin):
     self.portal = self.getPortal()
     self.getWorkflowTool().setChainForPortalTypes(['ERP5Workflow Test Document'], ())
     self.workflow_module = self.portal.portal_workflow
-    self.wf = self.workflow_module._getOb('testing_workflow_workflow') # workflow id comes with suffix
+    self.wf = self.workflow_module._getOb('workflow_testing_workflow') # workflow id comes with suffix
     type_test_object = self.portal.portal_types._getOb('ERP5Workflow Test Document')
     type_test_object.edit(type_erp5workflow_list=('workflow_testing_workflow', 'interactionworkflow_testing_interaction_workflow', ))
     self.resetComponentTool()
@@ -231,7 +231,7 @@ class TestERP5Workflow(TestERP5WorkflowMixin):
 
   def doActionFor(self, document, action):
     user_action = '_'.join(action.split('_')[0:-1]) + '_action' # remove suffix
-    self.portal.portal_workflow.doActionFor(document, user_action, wf_id = 'testing_workflow_workflow')
+    self.portal.portal_workflow.doActionFor(document, user_action, wf_id = 'workflow_testing_workflow')
 
 class TestDCWorkflow(TestERP5WorkflowMixin):
   """
@@ -245,7 +245,6 @@ class TestDCWorkflow(TestERP5WorkflowMixin):
     self.wf = self.workflow_module._getOb('testing_workflow')
     type_test_object = self.portal.portal_types['ERP5Workflow Test Document']
     type_test_object.edit(type_erp5workflow_list=())
-    type_test_object.edit(type_interaction_workflow_list=())
     self.resetComponentTool()
     self.assertEqual(type_test_object.getTypeErp5workflowList(), [])
     self.login()
-- 
2.30.9