slapos_erp5: Ignore bt5s from test or only present on production to compare the dump

This makes dev instance and production the similar.

master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_administration/ERP5Site_assertDumpedConfiguration.py

@@ -25,7 +25,8 @@ if show_all or configuration == "builder":
 
 if show_all or configuration == "bt":
   expected_file = portal.expected_business_template_dumped_configuration
-  found = portal.ERP5Site_dumpInstalledBusinessTemplateList()
+  found = portal.ERP5Site_dumpInstalledBusinessTemplateList(
+    ignore_business_template_list=["rapid_space_web_site"])
   print resolveDiff("Business Template Configuration Diff", expected_file, found)
 
 if show_all or configuration == "order_builder":

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SiteDump.py

@@ -28,23 +28,27 @@ class TestSlapOSDump(SlapOSTestCaseMixin):
       self.portal.portal_alarms[alarm_id].setEnabled(1)
     #####
     issue_count = 0
-    for dump, filename in [
-        ('ERP5Site_dumpAlarmToolConfiguration', 'expected_alarm_tool_dumped_configuration'),
-        ('ERP5Site_dumpBuilderList', 'expected_builder_dumped_configuration'),
-        ('ERP5Site_dumpInstalledBusinessTemplateList', 'expected_business_template_dumped_configuration'),
-        ('ERP5Site_dumpOrderBuilderList', 'expected_order_builder_dumped_configuration'),
-        ('ERP5Site_dumpPortalTypeActionList', 'expected_type_actions_dumped_configuration'),
-        ('ERP5Site_dumpPortalTypeList', 'expected_portal_type_dumped_configuration'),
-        ('ERP5Site_dumpPortalTypeRoleList', 'expected_role_dumped_configuration'),
-        ('ERP5Site_dumpPortalSkinsContent', 'expected_portal_skins_dumped_configuration'),
-        ('ERP5Site_dumpPropertySheetList', 'expected_property_sheet_dumped_configuration'),
-        ('ERP5Site_dumpRuleTesterList', 'expected_rule_dumped_configuration'),
-        ('ERP5Site_dumpSkinProperty', 'expected_skin_property_dumped_configuration'),
-        ('ERP5Site_dumpWorkflowChain', 'expected_workflow_dumped_configuration'),
+    for dump, filename, kwargs in [
+        ('ERP5Site_dumpAlarmToolConfiguration', 'expected_alarm_tool_dumped_configuration', None),
+        ('ERP5Site_dumpBuilderList', 'expected_builder_dumped_configuration', None),
+        ('ERP5Site_dumpInstalledBusinessTemplateList', 'expected_business_template_dumped_configuration',
+             {'ignore_business_template_list': ["erp5_ui_test_core"]}),
+        ('ERP5Site_dumpOrderBuilderList', 'expected_order_builder_dumped_configuration', None),
+        ('ERP5Site_dumpPortalTypeActionList', 'expected_type_actions_dumped_configuration', None),
+        ('ERP5Site_dumpPortalTypeList', 'expected_portal_type_dumped_configuration', None),
+        ('ERP5Site_dumpPortalTypeRoleList', 'expected_role_dumped_configuration', None),
+        ('ERP5Site_dumpPortalSkinsContent', 'expected_portal_skins_dumped_configuration', None),
+        ('ERP5Site_dumpPropertySheetList', 'expected_property_sheet_dumped_configuration', None),
+        ('ERP5Site_dumpRuleTesterList', 'expected_rule_dumped_configuration', None),
+        ('ERP5Site_dumpSkinProperty', 'expected_skin_property_dumped_configuration', None),
+        ('ERP5Site_dumpWorkflowChain', 'expected_workflow_dumped_configuration', None),
       ]:
       ZopeTestCase._print('\n')
       try:
+        if kwargs is None:
           location = self.write('%s' % filename, getattr(self.portal, dump)())
+        else:
+          location = self.write('%s' % filename, getattr(self.portal, dump)(**kwargs))
       except Exception:
         ZopeTestCase._print('Problem with %s\n' % dump)
         issue_count += 1