Commit 52388b7d authored by wenjie.zheng's avatar wenjie.zheng

ERP5TypeTestCase.py: install erp5_workflow right after install erp5_base.

parent 59cc5dfa
...@@ -19,6 +19,7 @@ import time ...@@ -19,6 +19,7 @@ import time
import traceback import traceback
import urllib import urllib
import ConfigParser import ConfigParser
from cStringIO import StringIO from cStringIO import StringIO
from cPickle import dumps from cPickle import dumps
from glob import glob from glob import glob
...@@ -759,7 +760,6 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin): ...@@ -759,7 +760,6 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
# Let's be a litte tolerant for the moment. # Let's be a litte tolerant for the moment.
BaseMessage.max_retry = property(lambda self: BaseMessage.max_retry = property(lambda self:
self.activity_kw.get('max_retry', 1)) self.activity_kw.get('max_retry', 1))
template_list = list(self.getBusinessTemplateList()) template_list = list(self.getBusinessTemplateList())
erp5_catalog_storage = os.environ.get('erp5_catalog_storage', erp5_catalog_storage = os.environ.get('erp5_catalog_storage',
'erp5_mysql_innodb_catalog') 'erp5_mysql_innodb_catalog')
...@@ -789,12 +789,13 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin): ...@@ -789,12 +789,13 @@ class ERP5TypeCommandLineTestCase(ERP5TypeTestCaseMixin):
hot_reindexing = self.enableHotReindexing() hot_reindexing = self.enableHotReindexing()
# install erp5_workflow to allow early stage workflow migration. # install erp5_workflow to allow early stage workflow migration.
for x, y in (("erp5_core_proxy_field_legacy", "erp5_base"), for x, y in (("erp5_core_proxy_field_legacy", "erp5_base"),
("erp5_stock_cache", "erp5_pdm"),("erp5_workflow", "erp5_pdm")): ("erp5_stock_cache", "erp5_pdm")):
if x not in template_list: if x not in template_list:
try: try:
template_list.insert(template_list.index(y), x) template_list.insert(template_list.index(y), x)
except ValueError: except ValueError:
pass pass
template_list.insert(template_list.index('erp5_base')+1, 'erp5_workflow')
self.setUpERP5Site(business_template_list=template_list, self.setUpERP5Site(business_template_list=template_list,
light_install=light_install, light_install=light_install,
create_activities=create_activities, create_activities=create_activities,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment