Commit c8516019 authored by Łukasz Nowak's avatar Łukasz Nowak Committed by Klaus Wölfel

Fetch information during subscribeNode

Also if process_timeout is available in received configuration setup
process_manager with transmitted value.

Backward compatibility is assured, that if no process_timeout is
provided, nothing is being updated.

Also process_timeout not set on master (the default), will not change
local default.
parent 5eb2929e
...@@ -322,8 +322,18 @@ shared = true ...@@ -322,8 +322,18 @@ shared = true
self.test_suite_portal = taskdistribution.TaskDistributor( self.test_suite_portal = taskdistribution.TaskDistributor(
portal_url, portal_url,
logger=DummyLogger(log)) logger=DummyLogger(log))
self.test_suite_portal.subscribeNode(node_title=config['test_node_title'], node_configuration = self.test_suite_portal.subscribeNode(node_title=config['test_node_title'],
computer_guid=config['computer_id']) computer_guid=config['computer_id'])
if type(node_configuration) == str:
# Backward compatiblity
node_configuration = json.loads(node_configuration)
if node_configuration is not None and \
'process_timeout' in node_configuration \
and node_configuration['process_timeout'] is not None:
process_timeout = node_configuration['process_timeout']
log('Received and using process timeout from master: %i' % (
process_timeout))
self.process_manager.max_timeout = process_timeout
test_suite_data = self.test_suite_portal.startTestSuite( test_suite_data = self.test_suite_portal.startTestSuite(
node_title=config['test_node_title'], node_title=config['test_node_title'],
computer_guid=config['computer_id']) computer_guid=config['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