Commit 4ceeeb03 authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'upstream/master' into zope4py2

parents bc6b543c 34b77150
Pipeline #24562 failed with stage
in 0 seconds
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_pdm
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_pdm
......
erp5_full_text_mroonga_catalog
erp5_dummy_movement
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_base
erp5_core_proxy_field_legacy
erp5_pdm
......
......@@ -46,7 +46,7 @@ class TestERP5Administration(InventoryAPITestCase):
"""
Same list as for Inventory API and add erp5_administration
"""
return InventoryAPITestCase.getBusinessTemplateList(self) + ('erp5_administration', )
return InventoryAPITestCase.getBusinessTemplateList(self) + ('erp5_full_text_mroonga_catalog', 'erp5_administration')
def test_01_RunCheckStockTableAlarm(self):
"""
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_pdm
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
......@@ -55,10 +55,6 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Delivery</string> </value>
</item>
</dictionary>
</pickle>
</record>
......
......@@ -82,10 +82,6 @@
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Delivery</string> </value>
</item>
</dictionary>
</pickle>
</record>
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_simulation
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_myisam_catalog
erp5_mrp
\ No newline at end of file
......@@ -51,6 +51,7 @@ class TestArchive(InventoryAPITestCase):
def getBusinessTemplateList(self):
return InventoryAPITestCase.getBusinessTemplateList(self) + (
'erp5_archive',
'erp5_full_text_mroonga_catalog',
)
# Different variables used for this test
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_pdm
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_web
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_pdm
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_myisam_catalog
erp5_core_proxy_field_legacy
erp5_pdm
erp5_simulation
......
erp5_full_text_myisam_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_simulation
......
......@@ -145,28 +145,22 @@
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>content_translation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>user_account_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value>
</item>
<item>
<key> <string>validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
</value>
</item>
</dictionary>
......@@ -176,63 +170,6 @@
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_log</string> </key>
<value>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate_content_translation</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>System Processes</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>content_translation_state</string> </key>
<value> <string>latest</string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1664349798.66</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="7" aka="AAAAAAAAAAc=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
......@@ -295,7 +232,7 @@
</dictionary>
</pickle>
</record>
<record id="8" aka="AAAAAAAAAAg=">
<record id="7" aka="AAAAAAAAAAc=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
......@@ -354,7 +291,7 @@
</dictionary>
</pickle>
</record>
<record id="9" aka="AAAAAAAAAAk=">
<record id="8" aka="AAAAAAAAAAg=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_myisam_catalog
erp5_base
\ No newline at end of file
......@@ -86,7 +86,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy',
'erp5_full_text_catalog',
'erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_configurator',
'erp5_configurator_standard',)
......
......@@ -41,6 +41,7 @@ class TestConfiguratorItem(TestLiveConfiguratorWorkflowMixin):
def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_configurator',
'erp5_simulation',
......
......@@ -38,6 +38,7 @@ class TestConfiguratorTool(TestLiveConfiguratorWorkflowMixin):
def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_configurator',
'erp5_configurator_standard',)
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base
erp5_configurator_standard
erp5_simulation
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base
\ No newline at end of file
erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base
\ No newline at end of file
......@@ -197,6 +197,7 @@ class TestOfficeJSSDKConfigurator(SecurityTestCase):
'erp5_dms_ui_test',
'erp5_font',
'erp5_forge',
'erp5_full_text_mroonga_catalog',
'erp5_gadget_interface_validator',
'erp5_hal_json_style',
'erp5_hr',
......
erp5_full_text_mroonga_catalog
erp5_administration
\ No newline at end of file
erp5_configurator_standard
\ No newline at end of file
erp5_configurator_standard
erp5_full_text_mroonga_catalog
\ No newline at end of file
......@@ -75,10 +75,6 @@
<key> <string>solver_action_title</string> </key>
<value> <string>First In, First Out</string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>FIFODeliverySolver</string> </value>
</item>
</dictionary>
</pickle>
</record>
......
......@@ -75,10 +75,6 @@
<key> <string>solver_action_title</string> </key>
<value> <string>Last In, First Out</string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>LIFODeliverySolver</string> </value>
</item>
</dictionary>
</pickle>
</record>
......
......@@ -75,10 +75,6 @@
<key> <string>solver_action_title</string> </key>
<value> <string>Minimise Price</string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>MinimisePriceDeliverySolver</string> </value>
</item>
</dictionary>
</pickle>
</record>
......
......@@ -146,10 +146,6 @@
<key> <string>solver_action_title</string> </key>
<value> <string>Cancel Quantity</string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>QuantityCancelSolver</string> </value>
</item>
<item>
<key> <string>workflow_list</string> </key>
<value>
......
......@@ -189,10 +189,6 @@
</tuple>
</value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>TradeModelSolver</string> </value>
</item>
<item>
<key> <string>workflow_list</string> </key>
<value>
......
......@@ -185,10 +185,6 @@
<key> <string>solver_action_title</string> </key>
<value> <string>Unify value</string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>UnifySolver</string> </value>
</item>
<item>
<key> <string>workflow_list</string> </key>
<value>
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
......@@ -39,7 +39,7 @@ class TestContentTranslation(ERP5TypeTestCase):
def getBusinessTemplateList(self):
return (
return ('erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_content_translation',
)
......
erp5_full_text_mroonga_catalog
erp5_l10n_fr
erp5_l10n_ja
\ No newline at end of file
......@@ -202,7 +202,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
return "ERP5Catalog"
def getBusinessTemplateList(self):
return ('erp5_base',)
return ('erp5_full_text_mroonga_catalog', 'erp5_base',)
# Different variables used for this test
username = 'seb'
......@@ -4150,6 +4150,9 @@ class CatalogToolUpgradeSchemaTestCase(ERP5TypeTestCase):
"""Tests for "upgrade schema" feature of ERP5 Catalog.
"""
def getBusinessTemplateList(self):
return ("erp5_full_text_mroonga_catalog",)
def afterSetUp(self):
# Add two connections
db1, db2 = getExtraSqlConnectionStringList()[:2]
......
......@@ -46,6 +46,7 @@ class TestERP5Coordinate(ERP5TypeTestCase):
Return the list of required business templates.
"""
return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base',)
def afterSetUp(self):
......
......@@ -35,7 +35,8 @@ class TestI18NSearch(ERP5TypeTestCase):
return "I18N Search"
def getBusinessTemplateList(self):
return ('erp5_base', )
return ('erp5_full_text_mroonga_catalog',
'erp5_base',)
def afterSetUp(self):
self.person_module = self.portal.person_module
......
......@@ -43,7 +43,7 @@ class TestVanillaERP5Catalog(ERP5TypeTestCase, LogInterceptor):
return "VanillaERP5Catalog"
def getBusinessTemplateList(self):
return ('erp5_base', )
return ('erp5_full_text_mroonga_catalog', 'erp5_base')
# Different variables used for this test
username = 'seb'
......
erp5_full_text_mroonga_catalog
erp5_base
erp5_csv_style
erp5_core_proxy_field_legacy
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
......@@ -55,6 +55,7 @@ class TestERP5Credential(ERP5TypeTestCase):
def getBusinessTemplateList(self):
return (
'erp5_full_text_mroonga_catalog',
'erp5_core_proxy_field_legacy',
'erp5_base',
'erp5_jquery',
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_jquery
erp5_ingestion_mysql_innodb_catalog
......
......@@ -85,7 +85,7 @@ class TestCRM(BaseTestCRM):
return "CRM"
def getBusinessTemplateList(self):
return (
return ('erp5_full_text_mroonga_catalog',
'erp5_core_proxy_field_legacy',
'erp5_base',
'erp5_ingestion',
......@@ -655,6 +655,7 @@ class TestCRMMailIngestion(BaseTestCRM):
def getBusinessTemplateList(self):
# Mail Ingestion must work with CRM alone.
return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_ingestion',
'erp5_ingestion_mysql_innodb_catalog',
......
erp5_full_text_mroonga_catalog
erp5_core_test
erp5_web
erp5_core_proxy_field_legacy
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_base
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
return ('erp5_core_proxy_field_legacy',
'erp5_full_text_catalog',
'erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_configurator',
'erp5_configurator_standard')
erp5_full_text_mroonga_catalog
erp5_ingestion_mysql_innodb_catalog
\ No newline at end of file
......@@ -100,6 +100,7 @@ class TestDocumentMixin(ERP5TypeTestCase):
business_template_list = ['erp5_core_proxy_field_legacy',
'erp5_jquery',
'erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_ingestion',
......
......@@ -34,6 +34,7 @@ class TestOOoConversionServerRetry(ERP5TypeTestCase):
def getBusinessTemplateList(self):
business_template_list = ['erp5_core_proxy_field_legacy',
'erp5_jquery',
'erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_ingestion',
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_ingestion_mysql_innodb_catalog
erp5_ingestion_test
......
erp5_full_text_mroonga_catalog
erp5_dms
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
\ No newline at end of file
......@@ -50,6 +50,7 @@ class TestTemplateTool(ERP5TypeTestCase):
def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base',
'erp5_crm',
'erp5_forge')
......
erp5_ui_test
erp5_full_text_mroonga_catalog
erp5_pdm
erp5_simulation
erp5_trade
......
erp5_full_text_mroonga_catalog
erp5_base
erp5_web
erp5_ingestion_mysql_innodb_catalog
......
......@@ -50,6 +50,7 @@ class TestFreeSubscription(ERP5TypeTestCase):
def getBusinessTemplateList(self):
return (
'erp5_full_text_mroonga_catalog',
'erp5_core_proxy_field_legacy',
'erp5_base',
'erp5_jquery',
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_jquery
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_ui_test_core
erp5_ui_test
erp5_dummy_movement
......
erp5_full_text_myisam_catalog
erp5_base
erp5_pdm
erp5_simulation
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_pdm
......
erp5_full_text_mroonga_catalog
erp5_ingestion_mysql_innodb_catalog
\ No newline at end of file
erp5_web
erp5_crm
erp5_dms
\ No newline at end of file
erp5_dms
erp5_full_text_myisam_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_apparel
......
erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base
erp5_pdm
erp5_simulation
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_dms
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
......@@ -48,7 +48,7 @@ class TestKMMixIn(TestDocumentMixin):
manager_password = ''
website_id = 'km_test'
business_template_list = ['erp5_core_proxy_field_legacy',
'erp5_base',
'erp5_full_text_mroonga_catalog','erp5_base',
'erp5_jquery', 'erp5_jquery_ui', 'erp5_knowledge_pad',
'erp5_ingestion_mysql_innodb_catalog', 'erp5_ingestion',
'erp5_web', 'erp5_dms',
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_jquery
erp5_jquery_ui
......
......@@ -43,7 +43,7 @@ class TestZeleniumKM(ERP5TypeFunctionalTestCase):
"""
# XXX This is a rough list, we should drop as much as we can, and
# keep only minimal
return ('erp5_core_proxy_field_legacy',
return ('erp5_core_proxy_field_legacy', 'erp5_full_text_mroonga_catalog',
'erp5_base', 'erp5_ui_test_core', 'erp5_ui_test',
'erp5_dhtml_style', 'erp5_dhtml_ui_test',
'erp5_jquery', 'erp5_jquery_ui',
......
erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base
erp5_ui_test
erp5_dhtml_style
......
......@@ -18,10 +18,6 @@
<key> <string>portal_type</string> </key>
<value> <string>Base Type</string> </value>
</item>
<item>
<key> <string>type_class</string> </key>
<value> <string>XMLObject</string> </value>
</item>
</dictionary>
</pickle>
</record>
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_item
erp5_accounting
erp5_invoicing
......
erp5_full_text_mroonga_catalog
erp5_oauth2_resource
\ No newline at end of file
erp5_full_text_myisam_catalog
erp5_credential
\ No newline at end of file
erp5_full_text_myisam_catalog
erp5_credential
erp5_web_renderjs_ui
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy
erp5_base
erp5_ingestion
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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