Commit 8a74eaf4 authored by Łukasz Nowak's avatar Łukasz Nowak

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

This reverts commit 77f2b98f.

setupPortalCertificateAuthority shall be done during site preparation in afterSetUp method.
And there are proper conditions related to live testing.

Conflicts:
	master/bt5/slapos_cloud/bt/revision, solved by += 1
parent 66c4f283
......@@ -18,12 +18,6 @@ class TestSlapOSCorePersonComputerSupply(testSlapOSMixin):
portal = self.getPortalObject()
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
computer = portal.computer_module.template_computer\
.Base_createCloneDocument(batch_mode=1)
......
......@@ -17,12 +17,6 @@ class TestSlapOSCorePersonRequest(testSlapOSMixin):
portal = self.getPortalObject()
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
person_user = portal.person_module.template_member.\
Base_createCloneDocument(batch_mode=1)
......
......@@ -16,12 +16,6 @@ class TestSlapOSCorePersonRequestComputer(testSlapOSMixin):
portal = self.getPortalObject()
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
person_user = portal.person_module.template_member\
.Base_createCloneDocument(batch_mode=1)
......
104
\ No newline at end of file
105
\ 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