Commit 41fa2d98 authored by Romain Courteaud's avatar Romain Courteaud

Call _aq_reset even if site already exists.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13186 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 30b510cb
...@@ -494,6 +494,7 @@ def setupERP5Site( business_template_list=(), ...@@ -494,6 +494,7 @@ def setupERP5Site( business_template_list=(),
(e.g. '("erp5_base", )'). (e.g. '("erp5_base", )').
''' '''
global IS_PORTAL_EXISTING global IS_PORTAL_EXISTING
from Products.ERP5Type.Base import _aq_reset
if portal_name in failed_portal_installation: if portal_name in failed_portal_installation:
raise RuntimeError, 'Installation of %s already failed, giving up'\ raise RuntimeError, 'Installation of %s already failed, giving up'\
% portal_name % portal_name
...@@ -597,7 +598,6 @@ def setupERP5Site( business_template_list=(), ...@@ -597,7 +598,6 @@ def setupERP5Site( business_template_list=(),
for m in portal_activities.getMessageList()],) for m in portal_activities.getMessageList()],)
# Reset aq dynamic, so all unit tests will start again # Reset aq dynamic, so all unit tests will start again
from Products.ERP5Type.Base import _aq_reset
_aq_reset() _aq_reset()
if os.environ.get('erp5_save_data_fs'): if os.environ.get('erp5_save_data_fs'):
...@@ -644,6 +644,7 @@ def setupERP5Site( business_template_list=(), ...@@ -644,6 +644,7 @@ def setupERP5Site( business_template_list=(),
importLocalDocument(id_) importLocalDocument(id_)
for id_ in getLocalConstraintList(): for id_ in getLocalConstraintList():
importLocalConstraint(id_) importLocalConstraint(id_)
_aq_reset()
if IS_PORTAL_EXISTING == 1: if IS_PORTAL_EXISTING == 1:
# Display which test is run when loading for the 1st time # Display which test is run when loading for the 1st time
......
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