Commit c955c181 authored by Gabriel Monnerat's avatar Gabriel Monnerat

merged slave_instance branch with master

parents 5901f56c 862dc598
...@@ -59,7 +59,7 @@ bt5_installation_list = ( \n ...@@ -59,7 +59,7 @@ bt5_installation_list = ( \n
\'erp5_trade\', \n \'erp5_trade\', \n
\'erp5_simulation_test\', \n \'erp5_simulation_test\', \n
\'erp5_item\', \n \'erp5_item\', \n
\'erp5_open_trade\', \n \'erp5_open_trade\',\n
\'erp5_forge\', \n \'erp5_forge\', \n
\'erp5_ingestion_mysql_innodb_catalog\', \n \'erp5_ingestion_mysql_innodb_catalog\', \n
\'erp5_ingestion\', \n \'erp5_ingestion\', \n
...@@ -98,12 +98,15 @@ bt5_installation_list = ( \n ...@@ -98,12 +98,15 @@ bt5_installation_list = ( \n
\'vifib_web\',\n \'vifib_web\',\n
\'vifib_open_trade\', \n \'vifib_open_trade\', \n
\'vifib_l10n_fr\',\n \'vifib_l10n_fr\',\n
\'vifib_datas\',\n \'vifib_data\',\n
\'vifib_data_web\',\n
\'vifib_data_category\',\n
\'vifib_erp5\'\n \'vifib_erp5\'\n
)\n )\n
\n \n
bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\', \n bt5_update_catalog = (\'erp5_ingestion_mysql_innodb_catalog\', \n
\'vifib_mysql_innodb_catalog\')\n \'vifib_mysql_innodb_catalog\', \n
\'erp5_content_translation\')\n
\n \n
for name in bt5_installation_list:\n for name in bt5_installation_list:\n
configuration_save.addConfigurationItem("Standard BT5 Configurator Item",\n configuration_save.addConfigurationItem("Standard BT5 Configurator Item",\n
......
11 12
\ No newline at end of file \ No newline at end of file
...@@ -63,7 +63,7 @@ software_type = kwargs.get("software_type") or "RootSoftwareInstance"\n ...@@ -63,7 +63,7 @@ software_type = kwargs.get("software_type") or "RootSoftwareInstance"\n
instance_xml = kwargs["instance_xml"]\n instance_xml = kwargs["instance_xml"]\n
sla_xml = kwargs.get("sla_xml") or ""\n sla_xml = kwargs.get("sla_xml") or ""\n
is_slave = kwargs.get("slave", False)\n is_slave = kwargs.get("slave", False)\n
state = kwargs.get("state") or "started"\n state = kwargs.get(\'state\') or \'started\'\n
\n \n
sale_order_portal_type = "Sale Order"\n sale_order_portal_type = "Sale Order"\n
sale_order_line_portal_type = "Sale Order Line"\n sale_order_line_portal_type = "Sale Order Line"\n
......
from test_suite import SavedTestSuite, ProjectTestSuite
class VIFIB(SavedTestSuite, ProjectTestSuite):
_product_list = ['Vifib']
_saved_test_id = 'Products.Vifib.tests.VifibMixin'
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