slapos_configurator:

* 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

master/bt5/slapos_configurator/SkinTemplateItem/portal_skins/slapos_configurator/TemplateTool_getSlapOSMasterBusinessTemplateList.py

@@ -6,7 +6,6 @@ bt5_update_catalog_list = bt5_installation_list
 keep_bt5_id_list = ['erp5_ui_test',
                     'erp5_ui_test_core',
                     'slapos_jio_ui_test',
-                    'slapos_category',
                     # XXX erp5_accounting_l10n_fr should be removed when bug is fixed
                     'erp5_accounting_l10n_fr',
                     'erp5_secure_payment',

master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py

@@ -86,7 +86,8 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
         well configured """
     # set preference
     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)
 
   def testConfiguredCertificateAuthoring(self):
@@ -136,6 +137,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
        'access_token_module',
        'account_module',
        'accounting_module',
+       'allocation_supply_module',
        'bug_module',
        'business_configuration_module',
        'business_process_module',
@@ -207,17 +209,13 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
        'sale_trade_condition_module',
        'service_module',
        'service_report_module',
-       'smart_assistant_file_module',
-       'smart_assistant_image_module',
-       'smart_assistant_sound_module',
-       'smart_assistant_text_module',
        'software_installation_module',
        'software_instance_module',
        'software_licence_module',
        'software_product_module',
        'software_publication_module',
        'software_release_module',
-       'sound_module',
+       'subscription_request_module',
        'support_request_module',
        'system_event_module',
        'task_module',
@@ -225,7 +223,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
        'test_page_module',
        'transformation_module',
        'upgrade_decision_module',
-       'video_module',
        'web_page_module',
        'web_site_module',
        'data_descriptor_module',
@@ -262,121 +259,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
     """ Make sure Installed business Templates are
         what it is expected.  """
 
-    expected_business_template_list = [
-      'erp5_core',
-      'erp5_xhtml_style',
-      'erp5_property_sheets',
-      'erp5_mysql_innodb_catalog',
-      'erp5_upgrader',
-      'slapos_upgrader',
-      'erp5_full_text_mroonga_catalog',
-      'erp5_core_proxy_field_legacy',
-      'erp5_base',
-      'erp5_administration',
-      'erp5_configurator',
-      'slapos_configurator',
-      'erp5_simulation',
-      'erp5_pdm',
-      'erp5_trade',
-      'erp5_tiosafe_core',
-      'erp5_item',
-      'erp5_forge',
-      'erp5_ingestion_mysql_innodb_catalog',
-      'erp5_ingestion',
-      'erp5_crm',
-      'erp5_system_event',
-      'erp5_secure_payment',
-      'erp5_security_uid_innodb_catalog',
-      'erp5_payzen_secure_payment',
-      'erp5_wechat_secure_payment',
-      'erp5_ooo_import',
-      'erp5_odt_style',
-      'erp5_ods_style',
-      'erp5_jquery',
-      'erp5_jquery_plugin_colorpicker',
-      'erp5_jquery_plugin_elastic',
-      'erp5_jquery_plugin_jqchart',
-      'erp5_jquery_plugin_mbmenu',
-      'erp5_jquery_plugin_sheet',
-      'erp5_jquery_sheet_editor',
-      'erp5_jquery_ui',
-      'erp5_deferred_style',
-      'erp5_dhtml_style',
-      'erp5_knowledge_pad',
-      'erp5_web',
-      'erp5_rss_style',
-      'erp5_dms',
-      'erp5_content_translation',
-      'erp5_software_pdm',
-      'erp5_svg_editor',
-      'erp5_syncml',
-      'erp5_computer_immobilisation',
-      'erp5_open_trade',
-      'erp5_accounting',
-      'erp5_commerce',
-      'erp5_credential',
-      'erp5_km',
-      'erp5_web_download_theme',
-      'erp5_web_shacache',
-      'erp5_data_set',
-      'erp5_web_shadir',
-      'erp5_invoicing',
-      'erp5_simplified_invoicing',
-      'erp5_credential_oauth2',
-      'erp5_accounting_l10n_fr',
-      'erp5_accounting_l10n_ifrs',
-      'erp5_code_mirror',
-      'erp5_font',
-      'erp5_hal_json_style',
-      'erp5_immobilisation',
-      'erp5_l10n_fr',
-      'erp5_l10n_ja',
-      'erp5_l10n_zh',
-      'erp5_monaco_editor',
-      'erp5_movement_table_catalog',
-      'erp5_web_renderjs_ui',
-      'erp5_web_service',
-      'erp5_graph_editor',
-      'slapos_jio',
-      'slapos_l10n_zh',
-      'erp5_bearer_token',
-      'erp5_certificate_authority',
-      'erp5_access_token',
-      'erp5_project',
-      'erp5_oauth',
-      'erp5_oauth_facebook_login',
-      'erp5_oauth_google_login',
-      'erp5_run_my_doc',
-      'erp5_slapos_tutorial',
-      'erp5_slapos_tutorial_data',	
-      'erp5_slideshow_style',
-      'erp5_authentication_policy',
-      'erp5_multimedia',
-      'erp5_corporate_identity',
-      'erp5_officejs',
-      'erp5_oauth2_resource',
-      'erp5_notebook',
-      'erp5_smart_assistant',
-      'erp5_interaction_drop',
-      'slapos_mysql_innodb_catalog',
-      'slapos_cloud',
-      'slapos_slap_tool',
-      'slapos_category',
-      'slapos_rss_style',
-      'slapos_pdm',
-      'slapos_crm',
-      'slapos_accounting',
-      'slapos_payzen',
-      'slapos_wechat',
-      'slapos_web_deploy',
-      'slapos_erp5',
-      'erp5_big_file',
-      'erp5_json_type',
-      'erp5_data_notebook',
-      'erp5_wendelin',
-      'slapos_abyss',
-      'erp5_development_wizard'
-    ]
+    expected_business_template_list = self.getExpectedBusinessTemplateInstalledAfterConfiguration()
 
     # If mixin contains a custom definition that introduce new business templated from
     # the project scope, them include it on expected list.