Commit b6cee74b authored by Gabriel Monnerat's avatar Gabriel Monnerat

Revert "add test to check if a slave instance is allocated correctly when each...

Revert "add test to check if a slave instance is allocated correctly when each software instance is associated to different computer"

This reverts commit 4950c333.
parent 4950c333
...@@ -391,8 +391,7 @@ class TestVifibSlapWebService(testVifibMixin): ...@@ -391,8 +391,7 @@ class TestVifibSlapWebService(testVifibMixin):
portal_type='Hosting Subscription').getUid()) portal_type='Hosting Subscription').getUid())
def stepSetSelectedComputerPartition(self, sequence, **kw): def stepSetSelectedComputerPartition(self, sequence, **kw):
"""Sets in sequence computer partition parameters related to current """Sets in sequence computer partition parameters related to current software instance"""
software instance"""
software_instance = self.portal.portal_catalog.getResultValue( software_instance = self.portal.portal_catalog.getResultValue(
uid=sequence['software_instance_uid']) uid=sequence['software_instance_uid'])
delivery_line = [q for q in software_instance delivery_line = [q for q in software_instance
...@@ -4528,44 +4527,6 @@ class TestVifibSlapWebService(testVifibMixin): ...@@ -4528,44 +4527,6 @@ class TestVifibSlapWebService(testVifibMixin):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self) sequence_list.play(self)
def test_SlaveInstance_getInstanceParameterDict_with_two_SlaveInstance(self):
"""
Check that with two Slave Instance installed in different computers, the
Slave Instance are allocated correctly
"""
sequence_list = SequenceList()
sequence_string = self.prepare_install_requested_computer_partition_sequence_string + """
Tic
LoginTestVifibCustomer
PersonRequestSlaveInstance
ConfirmOrderedSaleOrderActiveSense
Tic """ + self.prepare_published_software_release + \
self.prepare_formated_computer + """
Tic
LoginTestVifibAdmin
RequestSoftwareInstallation
Tic
Logout
SlapLoginCurrentComputer
ComputerSoftwareReleaseAvailable
Tic
SlapLogout
Tic
LoginTestVifibCustomer
PersonRequestSoftwareInstance
ConfirmOrderedSaleOrderActiveSense
Tic
LoginTestVifibCustomer
PersonRequestSlaveInstance
ConfirmOrderedSaleOrderActiveSense
Tic
SlapLoginCurrentComputer
CheckSlaveInstanceListFromOneComputerPartition
"""
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
def test_SlaveInstance_Person_request_without_SoftwareInstance(self): def test_SlaveInstance_Person_request_without_SoftwareInstance(self):
""" """
Check that one Slave Instance will wait allocation correctly when no Check that one Slave Instance will wait allocation correctly when no
......
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