Merge SLAPOS_MASTER virtual branch.

All tests have to pass with all possible combinations of code, so virtual
separation is meaningless.

master/product/Vifib/tests/VifibMixin.py

@@ -96,6 +96,10 @@ class testVifibMixin(ERP5TypeTestCase):
       'erp5_ui_test_core',
       'erp5_ui_test',
       'vifib_slapos_core',
+      'vifib_slapos_core_test',
+      'vifib_slapos_rest_api_v1_portal_type',
+      'vifib_slapos_rest_api_v1',
+      'vifib_slapos_rest_api_v1_test'
       'vifib_slapos_accounting',
       'vifib_mysql_innodb_catalog',
       'vifib_core',
@@ -414,16 +418,3 @@ class testVifibMixin(ERP5TypeTestCase):
     super(testVifibMixin, self).stepTic(**kw)
 
     self.checkDivergency()
-
-class testVifibMixinSlaposCore(testVifibMixin):
-  def getBusinessTemplateList(self):
-    result = super(testVifibMixinSlaposCore, self
-      ).getBusinessTemplateList()
-    result.extend([
-      'vifib_slapos_rest_api_v1_portal_type',
-      'vifib_slapos_rest_api_v1',
-      'vifib_slapos_core_test',
-      'vifib_slapos_rest_api_v1_test'
-    ])
-    return result
-

master/tests/__init__.py

 from test_suite import SavedTestSuite, ProjectTestSuite
 
-class SLAPOS_MASTER(SavedTestSuite, ProjectTestSuite):
+class VIFIB(SavedTestSuite, ProjectTestSuite):
+  _product_list = ['Vifib']
+  _saved_test_id = 'Products.Vifib.tests.VifibMixin.testVifibMixin'
   _bt_list = [
     'vifib_slapos_core',
     'vifib_slapos_core_test',
     'vifib_slapos_rest_api_v1',
     'vifib_slapos_rest_api_v1_portal_type',
     'vifib_slapos_rest_api_v1_test',
-  ]
-  _product_list = ['Vifib']
-  _saved_test_id = 'Products.Vifib.tests.VifibMixin.testVifibMixinSlaposCore'
-
-class VIFIB(SLAPOS_MASTER):
-  _saved_test_id = 'Products.Vifib.tests.VifibMixin.testVifibMixin'
-  _bt_list = SLAPOS_MASTER._bt_list + [
     'vifib_base',
     'vifib_core',
     'vifib_data',