Commit 77f2b98f authored by Rafael Monnerat's avatar Rafael Monnerat

Somehow revert "Drop obsoleted logic." and add isLiveTest check

  We should keep using setupPortalCertificate until ERP5TypeTestCase be improved
  in order to use slapos promise at the unit tests for portal_certificate. To be
  fixed by Rafael.
parent e1f4878a
...@@ -18,6 +18,12 @@ class TestSlapOSCorePersonComputerSupply(testSlapOSMixin): ...@@ -18,6 +18,12 @@ class TestSlapOSCorePersonComputerSupply(testSlapOSMixin):
portal = self.getPortalObject() portal = self.getPortalObject()
new_id = self.generateNewId() new_id = self.generateNewId()
# XXX setupPortalCertificateAuthority is deprecated but it
# cannot be completly removed yet, This is going to be
# replace such logic by promise alarms.
if not self.isLiveTest():
self.setupPortalCertificateAuthority()
# Clone computer document # Clone computer document
computer = portal.computer_module.template_computer\ computer = portal.computer_module.template_computer\
.Base_createCloneDocument(batch_mode=1) .Base_createCloneDocument(batch_mode=1)
......
...@@ -17,6 +17,12 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin): ...@@ -17,6 +17,12 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin):
portal = self.getPortalObject() portal = self.getPortalObject()
new_id = self.generateNewId() new_id = self.generateNewId()
# XXX setupPortalCertificateAuthority is deprecated but it
# cannot be completly removed yet, This is going to be
# replace such logic by promise alarms.
if not self.isLiveTest():
self.setupPortalCertificateAuthority()
# Clone person document # Clone person document
person_user = portal.person_module.template_member.\ person_user = portal.person_module.template_member.\
Base_createCloneDocument(batch_mode=1) Base_createCloneDocument(batch_mode=1)
......
...@@ -16,6 +16,12 @@ class TestSlapOSCorePersonRequestComputer(testSlapOSMixin): ...@@ -16,6 +16,12 @@ class TestSlapOSCorePersonRequestComputer(testSlapOSMixin):
portal = self.getPortalObject() portal = self.getPortalObject()
new_id = self.generateNewId() new_id = self.generateNewId()
# XXX setupPortalCertificateAuthority is deprecated but it
# cannot be completly removed yet, This is going to be
# replace such logic by promise alarms.
if not self.isLiveTest():
self.setupPortalCertificateAuthority()
# Clone person document # Clone person document
person_user = portal.person_module.template_member\ person_user = portal.person_module.template_member\
.Base_createCloneDocument(batch_mode=1) .Base_createCloneDocument(batch_mode=1)
......
99 100
\ No newline at end of file \ No newline at end of file
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