ERP5TypeTestCase.py: install erp5_workflow even if erp5_base is not required.

product/ERP5Type/tests/ERP5TypeTestCase.py

@@ -795,7 +795,10 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
             template_list.insert(template_list.index(y), x)
           except ValueError:
             pass
-      template_list.insert(template_list.index('erp5_base')+1, 'erp5_workflow')
+      if 'erp5_base' in template_list:
+        template_list.insert(template_list.index('erp5_base')+1, 'erp5_workflow')
+      else:
+        template_list.append('erp5_workflow')
       self.setUpERP5Site(business_template_list=template_list,
                          light_install=light_install,
                          create_activities=create_activities,
@@ -921,26 +924,24 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
     def dynamicalWorkflowConvertion(self):
       # Converting DCWorkflow dynamically
       workflow_tool = self.portal.portal_workflow
-      if workflow_tool.getPortalType() != "Workflow Tool":
-        raise NotImplementedError("Workflow tool has not been converted!")
-      start = DateTime()
-
-      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)
-            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:
-                ptype.addTypeWorkflowList(workflow_id)
-          LOG("dynamicalWorkflowConvertion, converting (workflow_id, time)", 0, (workflow_id, (DateTime()-start)*86400))
-      self.commit()
+      if workflow_tool.getPortalType() == "Workflow Tool":
+        start = DateTime()
+        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)
+              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:
+                  ptype.addTypeWorkflowList(workflow_id)
+            LOG("dynamicalWorkflowConvertion, converting (workflow_id, time)", 0, (workflow_id, (DateTime()-start)*86400))
+        self.commit()
 
 
     def setUpERP5Site(self,