Commit 2e1df74e authored by Rafael Monnerat's avatar Rafael Monnerat

TaskDistributionTool is gone

  Follow up erp5@ccbf9007
parent 2fd4b63a
...@@ -42,7 +42,7 @@ from slapos.slap.slap import ConnectionError ...@@ -42,7 +42,7 @@ from slapos.slap.slap import ConnectionError
from slapos.grid.utils import setRunning, setFinished from slapos.grid.utils import setRunning, setFinished
from erp5.util.taskdistribution import TaskDistributor, TaskDistributionTool from erp5.util.taskdistribution import TaskDistributor
from erp5.util.testnode.Updater import Updater from erp5.util.testnode.Updater import Updater
from erp5.util.testnode.ProcessManager import SubprocessError, ProcessManager, CancellationError from erp5.util.testnode.ProcessManager import SubprocessError, ProcessManager, CancellationError
...@@ -238,10 +238,6 @@ def main(): ...@@ -238,10 +238,6 @@ def main():
node_title=agent_parameter_dict['node_title'], node_title=agent_parameter_dict['node_title'],
computer_guid="None") computer_guid="None")
task_distribution_tool = TaskDistributionTool(
agent_parameter_dict['report_url'],
logger=logger)
if type(test_suite_data) == str: if type(test_suite_data) == str:
# Backward compatiblity # Backward compatiblity
test_suite_data = json.loads(test_suite_data) test_suite_data = json.loads(test_suite_data)
...@@ -286,7 +282,7 @@ def main(): ...@@ -286,7 +282,7 @@ def main():
# Backward compatiblity # Backward compatiblity
unit_test_dict = json.loads(unit_test_dict) unit_test_dict = json.loads(unit_test_dict)
test_result = task_distribution_tool.createTestResult( test_result = task_distributor.createTestResult(
revision=','.join(full_revision_list), revision=','.join(full_revision_list),
test_name_list=unit_test_dict.keys(), test_name_list=unit_test_dict.keys(),
node_title=agent_parameter_dict['node_title'], node_title=agent_parameter_dict['node_title'],
......
...@@ -240,7 +240,7 @@ def runUnitTest(): ...@@ -240,7 +240,7 @@ def runUnitTest():
args = parseArguments() args = parseArguments()
logger, fname = setupLogging('runScalabilityTestSuite', None) logger, fname = setupLogging('runScalabilityTestSuite', None)
try: try:
master = taskdistribution.TaskDistributionTool(args.test_suite_master_url) master = taskdistribution.TaskDistributor(args.test_suite_master_url)
test_suite_title = args.test_suite_title or args.test_suite test_suite_title = args.test_suite_title or args.test_suite
revision = args.revision revision = args.revision
......
...@@ -613,7 +613,7 @@ def main(): ...@@ -613,7 +613,7 @@ def main():
Function meant to be run by erp5testnode. Function meant to be run by erp5testnode.
""" """
args = parseArguments() args = parseArguments()
master = taskdistribution.TaskDistributionTool(args.master_url) master = taskdistribution.TaskDistributor(args.master_url)
test_suite_title = args.test_suite_title or args.test_suite test_suite_title = args.test_suite_title or args.test_suite
revision = args.revision revision = args.revision
......
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