From 7aa7d1e0b5a45d569a5ac1cff40108f565963c5c Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Thu, 14 Sep 2017 18:16:17 +0300 Subject: [PATCH] Save task's title and description Task format v2 allows to specify task title and description. It should be saved in the database, but was not. This patch moves initialization of TaskConfig before creating task object. If config is totally invalid, it is not a task and there is no reason to store trace in the db. Change-Id: I3be9c21ca634a92fc85685f4f7b333cb79636f6d --- tests/unit/doc/test_task_samples.py | 2 +- tests/unit/rally_jobs/test_jobs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/doc/test_task_samples.py b/tests/unit/doc/test_task_samples.py index aef20aff..4786c892 100644 --- a/tests/unit/doc/test_task_samples.py +++ b/tests/unit/doc/test_task_samples.py @@ -85,7 +85,7 @@ class TaskSampleTestCase(test.TestCase): except Exception: print(traceback.format_exc()) self.fail("Invalid JSON file: %s" % path) - eng = engine.TaskEngine(task_config, + eng = engine.TaskEngine(engine.TaskConfig(task_config), mock.MagicMock(), mock.Mock()) eng.validate(only_syntax=True) except Exception: diff --git a/tests/unit/rally_jobs/test_jobs.py b/tests/unit/rally_jobs/test_jobs.py index 802a2f48..3fa8a042 100644 --- a/tests/unit/rally_jobs/test_jobs.py +++ b/tests/unit/rally_jobs/test_jobs.py @@ -78,7 +78,7 @@ class RallyJobsTestCase(test.TestCase): task_inst = api._Task(api.API(skip_db_check=True)) task = task_inst.render_template( task_template=task_file.read(), **args) - task = yaml.safe_load(task) + task = engine.TaskConfig(yaml.safe_load(task)) task_obj = fakes.FakeTask({"uuid": full_path}) eng = engine.TaskEngine(task, task_obj, mock.Mock())