Skip to content

erp5
erp5
Commit 5be8733c authored by Arnaud Fontaine's avatar Arnaud Fontaine
Browse files
Options

erp5_configurator_standard_ui_test: Fix testFunctionalConfigurator failures... 

erp5_configurator_standard_ui_test: Fix testFunctionalConfigurator failures with erp5testnode (b955dbe0).

The following error occurred because setupAutomaticBusinessTemplateRepository()
was called and only added bt5/ directory but not bootstrap bt5s directory:
  BusinessTemplateMissingDependency: While analysing erp5_dhtml_style the following dependency could not be satisfied: erp5_xhtml_style ()
  Reason: Business Template could not be found in the repositories

Instead assume that bt5 repositories are set up properly.

Also, running through erp5testnode requires apache-backend Timeout to be
increased as waiting for upgrader activities to be processed can take
~15 minutes (!377).
parent 0b649664
Show whitespace changes
Inline Side-by-side
Showing with 220 additions and 35 deletions
bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.py
View file @ 5be8733c
...@@ -24,11 +24,6 @@ default_site_preference.setPreferredDocumentConversionServerUrl(previous_convers ...@@ -24,11 +24,6 @@ default_site_preference.setPreferredDocumentConversionServerUrl(previous_convers
if default_site_preference.getPreferenceState() != 'global': if default_site_preference.getPreferenceState() != 'global':
default_site_preference.enable() default_site_preference.enable()
# update repository info of Configurator site
if len(portal.portal_templates.getRepositoryList()) == 0:
portal.portal_templates.updateRepositoryBusinessTemplateList(
repository_list = bt_repository_list)
# (Re)Create the Business Configurator # (Re)Create the Business Configurator
bc_id = 'STANDARD_CONFIGURATOR_TEST' bc_id = 'STANDARD_CONFIGURATOR_TEST'
business_configuration = getattr(context.business_configuration_module, bc_id, None) business_configuration = getattr(context.business_configuration_module, bc_id, None)
......
product/ERP5Configurator/tests/testFunctionalConfigurator.py → bt5/erp5_configurator_standard_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalConfigurator.py
View file @ 5be8733c
...@@ -40,23 +40,8 @@ class TestZeleniumConfiguratorStandard(ERP5TypeFunctionalTestCase): ...@@ -40,23 +40,8 @@ class TestZeleniumConfiguratorStandard(ERP5TypeFunctionalTestCase):
if x.getId() == "user-Howto.Configure.ERP5.for.SMB.With.Configurator": if x.getId() == "user-Howto.Configure.ERP5.for.SMB.With.Configurator":
url_list.append("test_page_module/"+x.getId()) url_list.append("test_page_module/"+x.getId())
self.remote_code_url_list = url_list self.remote_code_url_list = url_list
self.setupAutomaticBusinessTemplateRepository()
ERP5TypeFunctionalTestCase.afterSetUp(self) ERP5TypeFunctionalTestCase.afterSetUp(self)
def getBusinessTemplateList(self):
"""
Return the list of business templates.
"""
return ('erp5_core_proxy_field_legacy', 'erp5_full_text_mroonga_catalog',
'erp5_base', 'erp5_workflow', 'erp5_configurator',
'erp5_configurator_standard', 'erp5_jquery',
'erp5_ui_test_core', 'erp5_accounting',
'erp5_web', 'erp5_ingestion',
'erp5_jquery', 'erp5_dms', 'erp5_jquery_ui', 'erp5_web',
'erp5_slideshow_style', 'erp5_knowledge_pad', 'erp5_run_my_doc',
'erp5_configurator_standard_ui_test',
)
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestZeleniumConfiguratorStandard)) suite.addTest(unittest.makeSuite(TestZeleniumConfiguratorStandard))
......
bt5/erp5_configurator_standard_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalConfigurator.xml 0 → 100644
View file @ 5be8733c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Test Component" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testFunctionalConfigurator</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testFunctionalConfigurator</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Test Component</string> </value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
product/ERP5Configurator/tests/testFunctionalConfiguratorConsulting.py → bt5/erp5_configurator_standard_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalConfiguratorConsulting.py
View file @ 5be8733c
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
############################################################################## ##############################################################################
import unittest import unittest
from Products.ERP5Configurator.tests.testFunctionalConfigurator import \ from erp5.component.test.testFunctionalConfigurator import \
TestZeleniumConfiguratorStandard TestZeleniumConfiguratorStandard
from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import \ from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import \
...@@ -43,10 +43,8 @@ class TestZeleniumConfiguratorConsulting(TestZeleniumConfiguratorStandard, ERP5T ...@@ -43,10 +43,8 @@ class TestZeleniumConfiguratorConsulting(TestZeleniumConfiguratorStandard, ERP5T
if x.getId() == "user-Howto.Configure.ERP5.for.SMB.With.Consultant.Configurator": if x.getId() == "user-Howto.Configure.ERP5.for.SMB.With.Consultant.Configurator":
url_list.append("test_page_module/"+x.getId()) url_list.append("test_page_module/"+x.getId())
self.remote_code_url_list = url_list self.remote_code_url_list = url_list
self.setupAutomaticBusinessTemplateRepository()
ERP5TypeFunctionalTestCase.afterSetUp(self) ERP5TypeFunctionalTestCase.afterSetUp(self)
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestZeleniumConfiguratorConsulting)) suite.addTest(unittest.makeSuite(TestZeleniumConfiguratorConsulting))
......
bt5/erp5_configurator_standard_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalConfiguratorConsulting.xml 0 → 100644
View file @ 5be8733c
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Test Component" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testFunctionalConfiguratorConsulting</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testFunctionalConfiguratorConsulting</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Test Component</string> </value>
</item>
<item>
<key> <string>sid</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate</string> </value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>validated</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
bt5/erp5_configurator_standard_ui_test/bt/template_test_id_list 0 → 100644
View file @ 5be8733c
test.erp5.testFunctionalConfigurator
test.erp5.testFunctionalConfiguratorConsulting
\ No newline at end of file
bt5/erp5_configurator_standard_ui_test/bt/test_dependency_list 0 → 100644
View file @ 5be8733c
erp5_full_text_mroonga_catalog
\ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7