Commit f78959fb authored by Rafael Monnerat's avatar Rafael Monnerat 👻

*: use more generic name

  This prevents updates after change the system
parent 762bc534
...@@ -13,7 +13,7 @@ def convertCategoryList(base, l): ...@@ -13,7 +13,7 @@ def convertCategoryList(base, l):
class TestSlapOSBuilderMixin(SlapOSTestCaseMixin): class TestSlapOSBuilderMixin(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def checkSimulationMovement(self, simulation_movement): def checkSimulationMovement(self, simulation_movement):
self.assertEqual(1.0, simulation_movement.getDeliveryRatio()) self.assertEqual(1.0, simulation_movement.getDeliveryRatio())
......
...@@ -28,7 +28,7 @@ def getSimulationStatePlannedDelivered(self, *args, **kwargs): ...@@ -28,7 +28,7 @@ def getSimulationStatePlannedDelivered(self, *args, **kwargs):
return 'planned' return 'planned'
class TestDefaultInvoiceTransactionRule(SlapOSTestCaseMixin): class TestDefaultInvoiceTransactionRule(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
@withAbort @withAbort
def test_simulation(self): def test_simulation(self):
...@@ -171,7 +171,7 @@ class TestDefaultInvoiceTransactionRule(SlapOSTestCaseMixin): ...@@ -171,7 +171,7 @@ class TestDefaultInvoiceTransactionRule(SlapOSTestCaseMixin):
class TestDefaultInvoiceRule(SlapOSTestCaseMixin): class TestDefaultInvoiceRule(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
@withAbort @withAbort
def test_simulation(self): def test_simulation(self):
...@@ -253,7 +253,7 @@ class TestDefaultInvoiceRule(SlapOSTestCaseMixin): ...@@ -253,7 +253,7 @@ class TestDefaultInvoiceRule(SlapOSTestCaseMixin):
class TestDefaultInvoicingRule(SlapOSTestCaseMixin): class TestDefaultInvoicingRule(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
@withAbort @withAbort
def test_simulation(self): def test_simulation(self):
...@@ -387,7 +387,7 @@ class TestDefaultInvoicingRule(SlapOSTestCaseMixin): ...@@ -387,7 +387,7 @@ class TestDefaultInvoicingRule(SlapOSTestCaseMixin):
.original_getSimulationState .original_getSimulationState
class TestDefaultPaymentRule(SlapOSTestCaseMixin): class TestDefaultPaymentRule(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
@withAbort @withAbort
def test_simulation(self): def test_simulation(self):
...@@ -865,7 +865,7 @@ class TestDefaultTradeModelRule(SlapOSTestCaseMixin): ...@@ -865,7 +865,7 @@ class TestDefaultTradeModelRule(SlapOSTestCaseMixin):
.original_getSimulationState .original_getSimulationState
class TestDefaultDeliveryRule(SlapOSTestCaseMixin): class TestDefaultDeliveryRule(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def test(self): def test(self):
resource, _, _, _, _, aggregate = self.bootstrapAllocableInstanceTree(is_accountable=True) resource, _, _, _, _, aggregate = self.bootstrapAllocableInstanceTree(is_accountable=True)
...@@ -959,7 +959,7 @@ class TestDefaultDeliveryRule(SlapOSTestCaseMixin): ...@@ -959,7 +959,7 @@ class TestDefaultDeliveryRule(SlapOSTestCaseMixin):
for q in simulation_movement.contentValues(portal_type='Applied Rule')]) for q in simulation_movement.contentValues(portal_type='Applied Rule')])
class TestDefaultDeliveryRuleConsumption(SlapOSTestCaseMixin): class TestDefaultDeliveryRuleConsumption(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def test(self): def test(self):
resource, _, _, _, _, aggregate = self.bootstrapAllocableInstanceTree(is_accountable=True) resource, _, _, _, _, aggregate = self.bootstrapAllocableInstanceTree(is_accountable=True)
......
...@@ -257,7 +257,7 @@ class TestSlapOSComputerConsumptionTioXMLFile_parseXml(SlapOSTestCaseMixinWithAb ...@@ -257,7 +257,7 @@ class TestSlapOSComputerConsumptionTioXMLFile_parseXml(SlapOSTestCaseMixinWithAb
class TestSlapOSComputerConsumptionTioXMLFile_solveInvoicingGeneration( class TestSlapOSComputerConsumptionTioXMLFile_solveInvoicingGeneration(
SlapOSTestCaseMixin): SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def createTioXMLFile(self): def createTioXMLFile(self):
document = self.portal.consumption_document_module.newContent( document = self.portal.consumption_document_module.newContent(
......
...@@ -30,7 +30,7 @@ from AccessControl.SecurityManagement import getSecurityManager, \ ...@@ -30,7 +30,7 @@ from AccessControl.SecurityManagement import getSecurityManager, \
class DefaultScenarioMixin(TestSlapOSSecurityMixin): class DefaultScenarioMixin(TestSlapOSSecurityMixin):
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
TestSlapOSSecurityMixin.afterSetUp(self) TestSlapOSSecurityMixin.afterSetUp(self)
......
...@@ -52,7 +52,7 @@ def _decode_with_json(value): ...@@ -52,7 +52,7 @@ def _decode_with_json(value):
class TestSlapOSCloudSlapOSCacheMixin( class TestSlapOSCloudSlapOSCacheMixin(
SlapOSTestCaseMixin): SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
...@@ -432,7 +432,7 @@ class TestBase_isValidXml(SlapOSTestCaseMixinWithAbort): ...@@ -432,7 +432,7 @@ class TestBase_isValidXml(SlapOSTestCaseMixinWithAbort):
class TestSlapOSCloudSoftwareInstance( class TestSlapOSCloudSoftwareInstance(
SlapOSTestCaseMixin): SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
...@@ -663,7 +663,7 @@ class TestSlapOSCloudSoftwareInstance( ...@@ -663,7 +663,7 @@ class TestSlapOSCloudSoftwareInstance(
class TestSlapOSCloudSlaveInstance( class TestSlapOSCloudSlaveInstance(
TestSlapOSCloudSoftwareInstance): TestSlapOSCloudSoftwareInstance):
launch_caucase = 1 require_certificate = 1
def _skipTest(self): def _skipTest(self):
pass pass
...@@ -683,7 +683,7 @@ class TestSlapOSCloudSlaveInstance( ...@@ -683,7 +683,7 @@ class TestSlapOSCloudSlaveInstance(
class TestSlapOSCloudSlapOSComputeNodeMixin_getCacheComputeNodeInformation( class TestSlapOSCloudSlapOSComputeNodeMixin_getCacheComputeNodeInformation(
SlapOSTestCaseMixin): SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
...@@ -897,7 +897,7 @@ class TestSlapOSCloudSlapOSComputeNodeMixin_getCacheComputeNodeInformation( ...@@ -897,7 +897,7 @@ class TestSlapOSCloudSlapOSComputeNodeMixin_getCacheComputeNodeInformation(
self.assertEqual(0, len(self.portal.portal_activities.getMessageList())) self.assertEqual(0, len(self.portal.portal_activities.getMessageList()))
class TestSlapOSCloudInstanceInvalidRequest(SlapOSTestCaseMixin): class TestSlapOSCloudInstanceInvalidRequest(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
......
...@@ -7,7 +7,7 @@ from erp5.component.module.DateUtils import addToDate ...@@ -7,7 +7,7 @@ from erp5.component.module.DateUtils import addToDate
class TestSlapOSCoreSlapOSAssertInstanceTreeSuccessorAlarm(SlapOSTestCaseMixin): class TestSlapOSCoreSlapOSAssertInstanceTreeSuccessorAlarm(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
################################################################# #################################################################
# slapos_cloud_create_missing_subscription_assignment # slapos_cloud_create_missing_subscription_assignment
################################################################# #################################################################
...@@ -244,7 +244,7 @@ class TestSlapOSCoreSlapOSAssertInstanceTreeSuccessorAlarm(SlapOSTestCaseMixin): ...@@ -244,7 +244,7 @@ class TestSlapOSCoreSlapOSAssertInstanceTreeSuccessorAlarm(SlapOSTestCaseMixin):
class TestSlapOSFreeComputePartitionAlarm(SlapOSTestCaseMixin): class TestSlapOSFreeComputePartitionAlarm(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
################################################################# #################################################################
# slapos_free_compute_partition # slapos_free_compute_partition
################################################################# #################################################################
...@@ -483,7 +483,7 @@ class TestSlapOSFreeComputePartitionAlarm(SlapOSTestCaseMixin): ...@@ -483,7 +483,7 @@ class TestSlapOSFreeComputePartitionAlarm(SlapOSTestCaseMixin):
class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin): class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
################################################################# #################################################################
# slapos_garbage_collect_destroyed_root_tree # slapos_garbage_collect_destroyed_root_tree
################################################################# #################################################################
...@@ -601,7 +601,7 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin): ...@@ -601,7 +601,7 @@ class TestSlapOSGarbageCollectDestroyedRootTreeAlarm(SlapOSTestCaseMixin):
class TestSlapOSUpdateComputeNodeCapacityScopeAlarm(SlapOSTestCaseMixin): class TestSlapOSUpdateComputeNodeCapacityScopeAlarm(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
################################################################# #################################################################
# slapos_update_compute_node_capacity_scope # slapos_update_compute_node_capacity_scope
################################################################# #################################################################
...@@ -832,7 +832,7 @@ class TestSlapOSUpdateComputeNodeCapacityScopeAlarm(SlapOSTestCaseMixin): ...@@ -832,7 +832,7 @@ class TestSlapOSUpdateComputeNodeCapacityScopeAlarm(SlapOSTestCaseMixin):
class TestSlapOSGarbageCollectStoppedRootTreeAlarm(SlapOSTestCaseMixin): class TestSlapOSGarbageCollectStoppedRootTreeAlarm(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
################################################################# #################################################################
# slapos_stop_collect_instance # slapos_stop_collect_instance
################################################################# #################################################################
...@@ -899,7 +899,7 @@ class TestSlapOSGarbageCollectStoppedRootTreeAlarm(SlapOSTestCaseMixin): ...@@ -899,7 +899,7 @@ class TestSlapOSGarbageCollectStoppedRootTreeAlarm(SlapOSTestCaseMixin):
class TestSlapOSGarbageCollectNonAllocatedRootTreeAlarm(SlapOSTestCaseMixin): class TestSlapOSGarbageCollectNonAllocatedRootTreeAlarm(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
################################################################# #################################################################
# slapos_garbage_collect_non_allocated_root_tree # slapos_garbage_collect_non_allocated_root_tree
################################################################# #################################################################
...@@ -1114,7 +1114,7 @@ class TestSlapOSGarbageCollectNonAllocatedRootTreeAlarm(SlapOSTestCaseMixin): ...@@ -1114,7 +1114,7 @@ class TestSlapOSGarbageCollectNonAllocatedRootTreeAlarm(SlapOSTestCaseMixin):
class TestSlapOSInvalidateDestroyedInstance(SlapOSTestCaseMixin): class TestSlapOSInvalidateDestroyedInstance(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
################################################################# #################################################################
# slapos_cloud_invalidate_destroyed_instance # slapos_cloud_invalidate_destroyed_instance
################################################################# #################################################################
...@@ -1292,7 +1292,7 @@ class TestSlapOSInvalidateDestroyedInstance(SlapOSTestCaseMixin): ...@@ -1292,7 +1292,7 @@ class TestSlapOSInvalidateDestroyedInstance(SlapOSTestCaseMixin):
class TestSlapOSPropagateRemoteNodeInstance(SlapOSTestCaseMixin): class TestSlapOSPropagateRemoteNodeInstance(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
################################################################# #################################################################
# slapos_cloud_propagate_remote_node_instance # slapos_cloud_propagate_remote_node_instance
......
...@@ -6,7 +6,7 @@ from unittest import skip ...@@ -6,7 +6,7 @@ from unittest import skip
class TestSlapOSAllocation(SlapOSTestCaseMixin): class TestSlapOSAllocation(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def makeAllocableComputeNode(self, project, software_product, def makeAllocableComputeNode(self, project, software_product,
release_variation, type_variation): release_variation, type_variation):
......
...@@ -26,7 +26,7 @@ from cryptography.x509.oid import NameOID ...@@ -26,7 +26,7 @@ from cryptography.x509.oid import NameOID
class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin): class TestSlapOSCoreComputeNodeSlapInterfaceWorkflow(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
......
...@@ -28,7 +28,7 @@ from cryptography.x509.oid import NameOID ...@@ -28,7 +28,7 @@ from cryptography.x509.oid import NameOID
class TestSlapOSCoreInstanceSlapInterfaceWorkflow(SlapOSTestCaseMixin): class TestSlapOSCoreInstanceSlapInterfaceWorkflow(SlapOSTestCaseMixin):
"""Tests instance.requestInstance""" """Tests instance.requestInstance"""
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
...@@ -1053,7 +1053,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflow(SlapOSTestCaseMixin): ...@@ -1053,7 +1053,7 @@ class TestSlapOSCoreInstanceSlapInterfaceWorkflow(SlapOSTestCaseMixin):
class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin): class TestSlapOSCoreInstanceSlapInterfaceWorkflowTransfer(SlapOSTestCaseMixin):
"""Tests instance.requestTransfer""" """Tests instance.requestTransfer"""
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
......
...@@ -25,7 +25,7 @@ from AccessControl.SecurityManagement import getSecurityManager, \ ...@@ -25,7 +25,7 @@ from AccessControl.SecurityManagement import getSecurityManager, \
class TestSlapOSCorePersonRequest(SlapOSTestCaseMixin): class TestSlapOSCorePersonRequest(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
......
...@@ -1032,7 +1032,7 @@ class TestSlapOSCrmStopInstanceTree(SlapOSTestCaseMixinWithAbort): ...@@ -1032,7 +1032,7 @@ class TestSlapOSCrmStopInstanceTree(SlapOSTestCaseMixinWithAbort):
class TestSlapOSCrmDeleteInstanceTree(SlapOSTestCaseMixinWithAbort): class TestSlapOSCrmDeleteInstanceTree(SlapOSTestCaseMixinWithAbort):
launch_caucase = 1 require_certificate = 1
def createRegularisationRequest(self): def createRegularisationRequest(self):
new_id = self.generateNewId() new_id = self.generateNewId()
......
...@@ -603,7 +603,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeProjectState(TestSlapOSCrmMonitorin ...@@ -603,7 +603,7 @@ class TestSlapOSCrmMonitoringCheckComputeNodeProjectState(TestSlapOSCrmMonitorin
class TestSlapOSCrmMonitoringCheckComputeNodeState(TestSlapOSCrmMonitoringMixin): class TestSlapOSCrmMonitoringCheckComputeNodeState(TestSlapOSCrmMonitoringMixin):
launch_caucase = 1 require_certificate = 1
########################################################################## ##########################################################################
# ComputeNode_checkProjectMontoringState > ComputeNode_checkMonitoringState # ComputeNode_checkProjectMontoringState > ComputeNode_checkMonitoringState
########################################################################## ##########################################################################
......
...@@ -229,7 +229,7 @@ class TestCRMPropertySheetConstraint(SlapOSTestCaseMixin): ...@@ -229,7 +229,7 @@ class TestCRMPropertySheetConstraint(SlapOSTestCaseMixin):
class TestProject_createTicketWithCausality(TestCRMSkinsMixin): class TestProject_createTicketWithCausality(TestCRMSkinsMixin):
launch_caucase = 1 require_certificate = 1
def testProject_createTicketWithCausality(self): def testProject_createTicketWithCausality(self):
self._makeComputeNode(self.project) self._makeComputeNode(self.project)
......
...@@ -599,7 +599,7 @@ class TestERP5Site_invalidate(TestSlapOSHalJsonStyleMixin): ...@@ -599,7 +599,7 @@ class TestERP5Site_invalidate(TestSlapOSHalJsonStyleMixin):
class TestComputeNode_get_revoke_Certificate(TestSlapOSHalJsonStyleMixin): class TestComputeNode_get_revoke_Certificate(TestSlapOSHalJsonStyleMixin):
launch_caucase = 1 require_certificate = 1
def test_ComputeNode_getCertificate(self): def test_ComputeNode_getCertificate(self):
compute_node = self._makeComputeNode() compute_node = self._makeComputeNode()
self.assertEqual(0, len(compute_node.objectValues(portal_type=["ERP5 Login", "Certificate Login"]))) self.assertEqual(0, len(compute_node.objectValues(portal_type=["ERP5 Login", "Certificate Login"])))
...@@ -1445,7 +1445,7 @@ return []""") ...@@ -1445,7 +1445,7 @@ return []""")
class TestSoftwareInstance_getAllocationInformation(TestSlapOSHalJsonStyleMixin): class TestSoftwareInstance_getAllocationInformation(TestSlapOSHalJsonStyleMixin):
launch_caucase = 1 require_certificate = 1
def test_SoftwareInstance_getAllocationInformation_not_allocated(self): def test_SoftwareInstance_getAllocationInformation_not_allocated(self):
self._makeTree() self._makeTree()
......
...@@ -32,7 +32,7 @@ from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctiona ...@@ -32,7 +32,7 @@ from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctiona
class TestSlapOSUIHalStyle(SlapOSTestCaseMixin, ERP5TypeFunctionalTestCase): class TestSlapOSUIHalStyle(SlapOSTestCaseMixin, ERP5TypeFunctionalTestCase):
foreground = 0 foreground = 0
run_only = "slaposjs_zuite" run_only = "slaposjs_zuite"
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
ERP5TypeFunctionalTestCase.afterSetUp(self) ERP5TypeFunctionalTestCase.afterSetUp(self)
......
...@@ -32,7 +32,7 @@ from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctiona ...@@ -32,7 +32,7 @@ from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctiona
class TestSlapOSUIZHHalStyle(SlapOSTestCaseMixin, ERP5TypeFunctionalTestCase): class TestSlapOSUIZHHalStyle(SlapOSTestCaseMixin, ERP5TypeFunctionalTestCase):
foreground = 0 foreground = 0
run_only = "slaposjs_zuite" run_only = "slaposjs_zuite"
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
ERP5TypeFunctionalTestCase.afterSetUp(self) ERP5TypeFunctionalTestCase.afterSetUp(self)
......
...@@ -32,7 +32,7 @@ from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctiona ...@@ -32,7 +32,7 @@ from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctiona
class TestSlapOSPanelStyle(SlapOSTestCaseMixin, ERP5TypeFunctionalTestCase): class TestSlapOSPanelStyle(SlapOSTestCaseMixin, ERP5TypeFunctionalTestCase):
foreground = 0 foreground = 0
run_only = "slapos_panel_zuite" run_only = "slapos_panel_zuite"
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
ERP5TypeFunctionalTestCase.afterSetUp(self) ERP5TypeFunctionalTestCase.afterSetUp(self)
......
...@@ -23,7 +23,7 @@ from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin ...@@ -23,7 +23,7 @@ from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin
class TestSlapOSPDMCreateUpgradeDecisionSkins(SlapOSTestCaseMixin): class TestSlapOSPDMCreateUpgradeDecisionSkins(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def test_createUpgradeDecision_destroyed_instance(self): def test_createUpgradeDecision_destroyed_instance(self):
instance_tree = self.portal.instance_tree_module.newContent( instance_tree = self.portal.instance_tree_module.newContent(
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin
class TestSlapOSDestroySoftwareInstallation(SlapOSTestCaseMixin): class TestSlapOSDestroySoftwareInstallation(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def bootstrapSoftwareInstallation(self, is_allocated=True, is_supplied=True): def bootstrapSoftwareInstallation(self, is_allocated=True, is_supplied=True):
if is_allocated: if is_allocated:
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin from erp5.component.test.SlapOSTestCaseMixin import SlapOSTestCaseMixin
class TestSlapOSPDMSkins(SlapOSTestCaseMixin): class TestSlapOSPDMSkins(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def test_requestUpgrade(self): def test_requestUpgrade(self):
software_product, _, type_variation, compute_node, _, instance_tree = self.bootstrapAllocableInstanceTree() software_product, _, type_variation, compute_node, _, instance_tree = self.bootstrapAllocableInstanceTree()
......
...@@ -49,7 +49,7 @@ def canonical_xml(xml): ...@@ -49,7 +49,7 @@ def canonical_xml(xml):
class TestSlapOSSlapToolMixin(SlapOSTestCaseMixin): class TestSlapOSSlapToolMixin(SlapOSTestCaseMixin):
launch_caucase = 1 require_certificate = 1
def afterSetUp(self): def afterSetUp(self):
SlapOSTestCaseMixin.afterSetUp(self) SlapOSTestCaseMixin.afterSetUp(self)
self.portal_slap = self.portal.portal_slap self.portal_slap = self.portal.portal_slap
......
...@@ -44,7 +44,7 @@ config = getConfiguration() ...@@ -44,7 +44,7 @@ config = getConfiguration()
class testSlapOSMixin(ERP5TypeCaucaseTestCase): class testSlapOSMixin(ERP5TypeCaucaseTestCase):
abort_transaction = 0 abort_transaction = 0
launch_caucase = 0 require_certificate = 0
def clearCache(self): def clearCache(self):
self.portal.portal_caches.clearAllCache() self.portal.portal_caches.clearAllCache()
...@@ -98,7 +98,7 @@ class testSlapOSMixin(ERP5TypeCaucaseTestCase): ...@@ -98,7 +98,7 @@ class testSlapOSMixin(ERP5TypeCaucaseTestCase):
self.portal.email_from_address = 'romain@nexedi.com' self.portal.email_from_address = 'romain@nexedi.com'
self.portal.email_to_address = 'romain@nexedi.com' self.portal.email_to_address = 'romain@nexedi.com'
if not self.isLiveTest() and self.launch_caucase: if not self.isLiveTest() and self.require_certificate:
self.setUpCaucase() self.setUpCaucase()
if getattr(self.portal.portal_caches, 'erp5_site_global_id', None): if getattr(self.portal.portal_caches, 'erp5_site_global_id', None):
......
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