Commit 96c6b78b authored by Cédric Le Ninivin's avatar Cédric Le Ninivin

Slapproxy won't raise if slave note ready

parent 56e1c7bf
...@@ -427,7 +427,7 @@ def request_slave(): ...@@ -427,7 +427,7 @@ def request_slave():
_connection_dict=xml2dict(slave['connection_xml']), _connection_dict=xml2dict(slave['connection_xml']),
xml = instance_xml, xml = instance_xml,
slap_computer_id=app.config['computer_id'], slap_computer_id=app.config['computer_id'],
slap_computer_partition_id=slave['hosted_by'], slap_computer_partition_id=partition['reference'],
slap_software_release_url=partition['software_release'], slap_software_release_url=partition['software_release'],
slap_server_url='slap_server_url', slap_server_url='slap_server_url',
slap_software_type=partition['software_type'], slap_software_type=partition['software_type'],
......
...@@ -322,7 +322,6 @@ class TestRequest (MasterMixin, unittest.TestCase): ...@@ -322,7 +322,6 @@ class TestRequest (MasterMixin, unittest.TestCase):
master_partition_id = self.request('http://sr//', None, master_partition_id = self.request('http://sr//', None,
'Maria', 'slappart4')._partition_id 'Maria', 'slappart4')._partition_id
# Failed request of slave instance # Failed request of slave instance
with self.assertRaises(TypeError):
self.request('http://sr//', None, 'Maria', 'slappart2', shared=True) self.request('http://sr//', None, 'Maria', 'slappart2', shared=True)
# Get updated information for master partition # Get updated information for master partition
rv = self.app.get('/getFullComputerInformation?computer_id=' rv = self.app.get('/getFullComputerInformation?computer_id='
......
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