From 2c6277979670b81494690cb1917e0c945cf8d9a8 Mon Sep 17 00:00:00 2001 From: Benjamin Blanc <benjamin.blanc@tiolive.com> Date: Fri, 6 Sep 2013 17:19:10 +0200 Subject: [PATCH] taskdistribution: add computer_guid parameter --- erp5/util/taskdistribution/__init__.py | 4 ++-- erp5/util/testnode/testnode.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erp5/util/taskdistribution/__init__.py b/erp5/util/taskdistribution/__init__.py index d13102b3af..b1907f3fc0 100644 --- a/erp5/util/taskdistribution/__init__.py +++ b/erp5/util/taskdistribution/__init__.py @@ -487,12 +487,12 @@ class TaskDistributor(RPCRetry): raise ValueError('Unsupported protocol revision: %r', protocol_revision) - def startTestSuite(self,node_title): + def startTestSuite(self,node_title,computer_guid='unknown'): """ Returns None if no test suite is needed. therwise, returns a JSON with all the test suite parameters. """ - result = self._retryRPC('startTestSuite',(node_title,)) + result = self._retryRPC('startTestSuite',(node_title,computer_guid,)) return result def getTestType(self): diff --git a/erp5/util/testnode/testnode.py b/erp5/util/testnode/testnode.py index 2266e5a5ef..1ed6245eb9 100644 --- a/erp5/util/testnode/testnode.py +++ b/erp5/util/testnode/testnode.py @@ -331,7 +331,7 @@ branch = %(branch)s self.portal = portal self.test_suite_portal = taskdistribution.TaskDistributor(portal_url, logger=DummyLogger(log)) self.test_suite_portal.subscribeNode(config['test_node_title'], config['computer_id']) - test_suite_json = self.test_suite_portal.startTestSuite(config['test_node_title']) + test_suite_json = self.test_suite_portal.startTestSuite(config['test_node_title'], config['computer_id']) test_suite_data = Utils.deunicodeData(json.loads(test_suite_json)) log("Got following test suite data from master : %r" % \ (test_suite_data,)) -- 2.30.9