ERP5TypeTestCase.py: convert the workflow before logout.

product/ERP5Type/tests/ERP5TypeTestCase.py

@@ -921,28 +921,26 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
         if not quiet:
           ZopeTestCase._print('done (%.3fs)\n' % (time.time() - start))
 
-    def dynamicalWorkflowConvertion(self):
+    def dynamicalWorkflowConversion(self):
       # Converting DCWorkflow dynamically
       workflow_tool = self.portal.portal_workflow
       if workflow_tool.getPortalType() == "Workflow Tool":
-        start = DateTime()
+        type_workflow_dict = workflow_tool.getChainsByType()
         for workflow_id in workflow_tool:
           workflow = workflow_tool._getOb(workflow_id)
           if workflow.getPortalType() not in ['Workflow', 'Interaction Workflow', 'Configuration Workflow']:
             new_workflow = workflow_tool.dc_workflow_asERP5Object(workflow_tool, workflow, temp=0)
-            type_workflow_dict = workflow_tool.getChainsByType()
             for ptype_id in type_workflow_dict:
-              ptype = getattr(workflow_tool.getPortalObject().portal_types, ptype_id, None)
+              ptype = getattr(self.portal.portal_types, ptype_id, None)
               if ptype is not None and workflow_id in workflow_tool.getChainsByType()[ptype_id]:
                 # 1. clean DC workflow assignement:
                 workflow_tool.delTypeCBT(ptype_id, workflow_id)
                 # 2. assign ERP5 Workflow to portal type:
-                type_workflow_list = ptype.getTypeWorkflowList()
-                if workflow_id not in type_workflow_list:
+                if workflow_id not in ptype.getTypeWorkflowList():
                   ptype.addTypeWorkflowList(workflow_id)
-            LOG("dynamicalWorkflowConvertion, converting (workflow_id, time)", 0, (workflow_id, (DateTime()-start)*86400))
         self.commit()
-
+        for pt_id in sorted(type_workflow_dict):
+          ptype = getattr(self.portal.portal_types, pt_id, None)
 
     def setUpERP5Site(self,
                      business_template_list=(),
@@ -1047,10 +1045,9 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
             if hot_reindexing:
               setattr(app,'isIndexable', 1)
               portal.portal_catalog.manage_hotReindexAll()
-
             portal.portal_types.resetDynamicDocumentsOnceAtTransactionBoundary()
             self.tic(not quiet)
-            self.dynamicalWorkflowConvertion()
+            self.dynamicalWorkflowConversion()
             # Log out
             if not quiet:
               ZopeTestCase._print('Logout ... \n')