Commit d7ecedad authored by Benjamin Blanc's avatar Benjamin Blanc

Fix (typo)

parent 40dd7a62
......@@ -76,7 +76,7 @@ class ScalabilityTestRunner():
def prepareSlapOSForTestNode(self, test_node_slapos=None):
"""
Install all softwares used to run tests (ex : launcher software)
We will build slapos software needed by the testnode itself,
"""
software_path_list = []
software_path_list.append(self.testnode.config.get("software_list"))
......@@ -88,7 +88,7 @@ class ScalabilityTestRunner():
def prepareSlapOSForTestSuite(self, node_test_suite):
"""
Install all testsuite's softwares (on worker_nodes)
Install all testsuite's software
"""
# In fact we just need to extract (by knowing the ipv6)
# softwares ipv6-url ( created during constructProfile(...) )
......@@ -96,8 +96,8 @@ class ScalabilityTestRunner():
# TODO : extract software paths (ipv6+local suite path+password?) from node_test_suite
software_path_list = []
for software_path in software_path_list:
for worker_node in self.worker_nodes:
self._prepareSlapOS(software_path,worker_node['computer_id'])
for involved_node in self.involved_nodes:
self._prepareSlapOS(software_path, involved_node['computer_id'])
# TODO : change the line below
return {'status_code' : 0}
......
......@@ -333,12 +333,10 @@ branch = %(branch)s
self.cleanUp(None)
remote_test_result_needs_cleanup = False
begin = time.time()
portal_url = config['test_suite_master_url']
portal = taskdistribution.TaskDistributionTool(portal_url, logger=DummyLogger(log))
self.portal = portal
test_suite_portal = taskdistribution.TaskDistributor(portal_url, logger=DummyLogger(log))
test_suite_json = test_suite_portal.startTestSuite(config['test_node_title'])
test_suite_data = deunicodeData(json.loads(test_suite_json))
log("Got following test suite data from master : %r" % \
......@@ -363,7 +361,7 @@ from the distributor.")
elif my_type_test == 'ScalabilityTest':
runner = ScalabilityTestRunner(self)
else:
log("testnode, Runner type '%s' not implemented.", %(my_type_test))
log("testnode, Runner type not implemented.", my_type_test)
raise NotImplementedError
......
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