Commit e364bd30 authored by Romain Courteaud's avatar Romain Courteaud

slapos_configurator:

* XXX do not install slapos_subscription_request
  Everything should work without it.
  It will be rework later.
* update configurator test with new bt5/module
* slapos_subscription_request bt5 is installed again
* do not prevent slapos_category to be updated
  otherwise, new categories are not installed
* test: dropped module
* use backup cloudooo
  nexedi/slapos@a729a677
* test: manye dependencies have been dropped
* test: fixup rebase
parent 68b293a4
...@@ -6,7 +6,6 @@ bt5_update_catalog_list = bt5_installation_list ...@@ -6,7 +6,6 @@ bt5_update_catalog_list = bt5_installation_list
keep_bt5_id_list = ['erp5_ui_test', keep_bt5_id_list = ['erp5_ui_test',
'erp5_ui_test_core', 'erp5_ui_test_core',
'slapos_jio_ui_test', 'slapos_jio_ui_test',
'slapos_category',
# XXX erp5_accounting_l10n_fr should be removed when bug is fixed # XXX erp5_accounting_l10n_fr should be removed when bug is fixed
'erp5_accounting_l10n_fr', 'erp5_accounting_l10n_fr',
'erp5_secure_payment', 'erp5_secure_payment',
......
...@@ -93,7 +93,8 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -93,7 +93,8 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
well configured.""" well configured."""
# set preference # set preference
preference_tool = self.portal.portal_preferences preference_tool = self.portal.portal_preferences
conversion_url = ["https://cloudooo.erp5.net/"] conversion_url = ["https://cloudooo.erp5.net/",
"https://cloudooo1.erp5.net/"]
self.assertEqual(preference_tool.getPreferredDocumentConversionServerUrlList(), conversion_url) self.assertEqual(preference_tool.getPreferredDocumentConversionServerUrlList(), conversion_url)
def testConfiguredCertificateAuthoring(self): def testConfiguredCertificateAuthoring(self):
...@@ -152,6 +153,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -152,6 +153,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
'access_token_module', 'access_token_module',
'account_module', 'account_module',
'accounting_module', 'accounting_module',
'allocation_supply_module',
'bug_module', 'bug_module',
'business_configuration_module', 'business_configuration_module',
'business_process_module', 'business_process_module',
...@@ -223,18 +225,12 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -223,18 +225,12 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
'sale_trade_condition_module', 'sale_trade_condition_module',
'service_module', 'service_module',
'service_report_module', 'service_report_module',
'smart_assistant_file_module',
'smart_assistant_image_module',
'smart_assistant_sound_module',
'smart_assistant_text_module',
'software_installation_module', 'software_installation_module',
'software_instance_module', 'software_instance_module',
'software_licence_module', 'software_licence_module',
'software_product_module', 'software_product_module',
'software_publication_module', 'software_publication_module',
'software_release_module', 'software_release_module',
'sound_module',
'subscription_condition_module',
'subscription_request_module', 'subscription_request_module',
'support_request_module', 'support_request_module',
'system_event_module', 'system_event_module',
...@@ -243,7 +239,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -243,7 +239,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
'test_page_module', 'test_page_module',
'transformation_module', 'transformation_module',
'upgrade_decision_module', 'upgrade_decision_module',
'video_module',
'web_page_module', 'web_page_module',
'web_site_module', 'web_site_module',
'data_descriptor_module', 'data_descriptor_module',
......
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