Skip to content

S
slapos.core
Commit 2d4bf193 authored by Antoine Catton's avatar Antoine Catton
Browse files
Options

Merge branch 'master' into rename_instance

parents 28102c31 cddc3cc4
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 1 deletion
master/product/Vifib/tests/testVifibSkinSelection.py
View file @ 2d4bf193
...@@ -146,6 +146,7 @@ erp5_gadget ...@@ -146,6 +146,7 @@ erp5_gadget
erp5_glossary erp5_glossary
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -154,12 +155,15 @@ erp5_ods_core ...@@ -154,12 +155,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -236,6 +240,7 @@ erp5_gadget ...@@ -236,6 +240,7 @@ erp5_gadget
erp5_glossary erp5_glossary
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -244,12 +249,15 @@ erp5_ods_core ...@@ -244,12 +249,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -326,6 +334,7 @@ erp5_gadget ...@@ -326,6 +334,7 @@ erp5_gadget
erp5_glossary erp5_glossary
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -334,12 +343,15 @@ erp5_ods_core ...@@ -334,12 +343,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -411,6 +423,7 @@ erp5_gadget ...@@ -411,6 +423,7 @@ erp5_gadget
erp5_glossary erp5_glossary
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -418,12 +431,15 @@ erp5_ods_core ...@@ -418,12 +431,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -494,6 +510,7 @@ erp5_gadget ...@@ -494,6 +510,7 @@ erp5_gadget
erp5_glossary erp5_glossary
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -501,12 +518,15 @@ erp5_ods_core ...@@ -501,12 +518,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -579,6 +599,7 @@ erp5_glossary ...@@ -579,6 +599,7 @@ erp5_glossary
erp5_html_compatibility erp5_html_compatibility
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -587,12 +608,15 @@ erp5_ods_core ...@@ -587,12 +608,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -665,6 +689,7 @@ erp5_gadget ...@@ -665,6 +689,7 @@ erp5_gadget
erp5_glossary erp5_glossary
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -674,12 +699,15 @@ erp5_ods_core ...@@ -674,12 +699,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -751,6 +779,7 @@ erp5_gadget ...@@ -751,6 +779,7 @@ erp5_gadget
erp5_glossary erp5_glossary
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -758,12 +787,15 @@ erp5_ods_core ...@@ -758,12 +787,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
...@@ -834,6 +866,7 @@ erp5_gadget ...@@ -834,6 +866,7 @@ erp5_gadget
erp5_glossary erp5_glossary
erp5_ingestion erp5_ingestion
erp5_ingestion_test erp5_ingestion_test
erp5_integration
erp5_invoicing erp5_invoicing
erp5_item erp5_item
erp5_item_trade erp5_item_trade
...@@ -841,12 +874,15 @@ erp5_ods_core ...@@ -841,12 +874,15 @@ erp5_ods_core
erp5_odt_core erp5_odt_core
erp5_ooo_import erp5_ooo_import
erp5_open_trade erp5_open_trade
erp5_payzen_secure_payment
erp5_pdm erp5_pdm
erp5_project erp5_project
erp5_project_trade erp5_project_trade
erp5_secure_payment
erp5_simplified_invoicing erp5_simplified_invoicing
erp5_simulation_test erp5_simulation_test
erp5_software_pdm erp5_software_pdm
erp5_system_event
erp5_tax_resource erp5_tax_resource
erp5_toolbox erp5_toolbox
erp5_trade erp5_trade
......
master/product/Vifib/tests/testVifibSlapBug.py
View file @ 2d4bf193
from Products.ERP5Type.tests.Sequence import SequenceList from Products.ERP5Type.tests.Sequence import SequenceList
import unittest import unittest
from testVifibSlapWebService import TestVifibSlapWebServiceMixin from testVifibSlapWebService import TestVifibSlapWebServiceMixin
from slapos import slap
import random import random
class TestVifibSlapBug(TestVifibSlapWebServiceMixin): class TestVifibSlapBug(TestVifibSlapWebServiceMixin):
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7