Commit f1ad3180 authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_configurator: Extend expected list with custom entries if set

   This allow introduce minor custom changes on project specific context w/o re-implement the whole test.
parent a29761e3
...@@ -161,8 +161,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -161,8 +161,7 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
module_list = [module.getId() for module in self.portal.objectValues() module_list = [module.getId() for module in self.portal.objectValues()
if getattr(module, "getIdGenerator", None) is not None and \ if getattr(module, "getIdGenerator", None) is not None and \
module.getIdGenerator() == "_generatePerDayId"] module.getIdGenerator() == "_generatePerDayId"]
self.assertSameSet(module_list, expected_module_list = [
[
'access_token_module', 'access_token_module',
'account_module', 'account_module',
'accounting_module', 'accounting_module',
...@@ -252,7 +251,13 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -252,7 +251,13 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
'web_page_module', 'web_page_module',
'web_site_module', 'web_site_module',
'workflow_module', 'workflow_module',
]) ]
# If mixin contains a custom definition that introduce new business templated from
# the project scope, them include it on expected list.
expected_module_list += getattr(self,
"_testSlapOSConfigurator_custom_expected_module_list", [])
self.assertSameSet(module_list, expected_module_list)
def testConfiguredBusinessTemplateList(self): def testConfiguredBusinessTemplateList(self):
...@@ -362,5 +367,11 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin): ...@@ -362,5 +367,11 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
'slapos_web_deploy', 'slapos_web_deploy',
'slapos_erp5', 'slapos_erp5',
] ]
# If mixin contains a custom definition that introduce new business templated from
# the project scope, them include it on expected list.
expected_business_template_list += getattr(self,
"_testSlapOSConfigurator_custom_additional_bt5_list", [])
self.assertSameSet(expected_business_template_list, self.assertSameSet(expected_business_template_list,
self.portal.portal_templates.getInstalledBusinessTemplateTitleList()) self.portal.portal_templates.getInstalledBusinessTemplateTitleList())
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