Commit d04d99bc authored by Łukasz Nowak's avatar Łukasz Nowak

Merge SLAPOS_MASTER virtual branch.

All tests have to pass with all possible combinations of code, so virtual
separation is meaningless.
parent 4582a47c
...@@ -96,6 +96,10 @@ class testVifibMixin(ERP5TypeTestCase): ...@@ -96,6 +96,10 @@ class testVifibMixin(ERP5TypeTestCase):
'erp5_ui_test_core', 'erp5_ui_test_core',
'erp5_ui_test', 'erp5_ui_test',
'vifib_slapos_core', '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_slapos_accounting',
'vifib_mysql_innodb_catalog', 'vifib_mysql_innodb_catalog',
'vifib_core', 'vifib_core',
...@@ -414,16 +418,3 @@ class testVifibMixin(ERP5TypeTestCase): ...@@ -414,16 +418,3 @@ class testVifibMixin(ERP5TypeTestCase):
super(testVifibMixin, self).stepTic(**kw) super(testVifibMixin, self).stepTic(**kw)
self.checkDivergency() 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
from test_suite import SavedTestSuite, ProjectTestSuite 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 = [ _bt_list = [
'vifib_slapos_core', 'vifib_slapos_core',
'vifib_slapos_core_test', 'vifib_slapos_core_test',
'vifib_slapos_rest_api_v1', 'vifib_slapos_rest_api_v1',
'vifib_slapos_rest_api_v1_portal_type', 'vifib_slapos_rest_api_v1_portal_type',
'vifib_slapos_rest_api_v1_test', '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_base',
'vifib_core', 'vifib_core',
'vifib_data', 'vifib_data',
......
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