Commit dea28698 authored by Roque's avatar Roque

Code cleanup and summary of changes.

Cleanup:
- Debug comments removed
- Log entries for debug removed

Unique change:
- The instantiation of ScalabilityRunner doesn't work with a node_test_suite, so now it uses the testNode (self) directly.
parent cba1f4e0
...@@ -65,7 +65,6 @@ class TestNode(object): ...@@ -65,7 +65,6 @@ class TestNode(object):
max_temp_time=MAX_TEMP_TIME): max_temp_time=MAX_TEMP_TIME):
self.testnode_log = log self.testnode_log = log
self.log = log self.log = log
self.log("Config parameter in TestNode.init(): " + str(config))
self.config = config or {} self.config = config or {}
self.process_manager = ProcessManager(log) self.process_manager = ProcessManager(log)
self.working_directory = config['working_directory'] self.working_directory = config['working_directory']
...@@ -376,7 +375,6 @@ shared = true ...@@ -376,7 +375,6 @@ shared = true
if my_test_type == 'UnitTest': if my_test_type == 'UnitTest':
runner = UnitTestRunner(node_test_suite) runner = UnitTestRunner(node_test_suite)
elif my_test_type == 'ScalabilityTest': elif my_test_type == 'ScalabilityTest':
log("instantiating runner for test suite")
runner = ScalabilityTestRunner(self) runner = ScalabilityTestRunner(self)
else: else:
log("testnode, Runner type %s not implemented.", my_test_type) log("testnode, Runner type %s not implemented.", my_test_type)
...@@ -409,7 +407,7 @@ shared = true ...@@ -409,7 +407,7 @@ shared = true
log("Getting configuration from test suite " + str(node_test_suite.test_suite_title)) log("Getting configuration from test suite " + str(node_test_suite.test_suite_title))
generated_config = self.test_suite_portal.generateConfiguration(node_test_suite.test_suite_title) generated_config = self.test_suite_portal.generateConfiguration(node_test_suite.test_suite_title)
log("Generated configuration: " + str(generated_config)) #log("Generated configuration: " + str(generated_config)) # kept for debug
jsonData = json.loads(generated_config) jsonData = json.loads(generated_config)
cluster_configuration = Utils.deunicodeData(jsonData['configuration_list'][0]) cluster_configuration = Utils.deunicodeData(jsonData['configuration_list'][0])
node_test_suite.edit(cluster_configuration=cluster_configuration) node_test_suite.edit(cluster_configuration=cluster_configuration)
......
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