From c594a2d9ab36a4243b16d0d2e7773b47027d5736 Mon Sep 17 00:00:00 2001 From: Jorrit Schaap <schaap@astron.nl> Date: Mon, 6 Jul 2020 11:10:31 +0200 Subject: [PATCH] TMSS-189: use schedulable template and spec --- SAS/TMSS/test/t_scheduling.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/SAS/TMSS/test/t_scheduling.py b/SAS/TMSS/test/t_scheduling.py index a6bf36f1988..815ea142c7d 100755 --- a/SAS/TMSS/test/t_scheduling.py +++ b/SAS/TMSS/test/t_scheduling.py @@ -58,15 +58,19 @@ test_data_creator = TMSSRESTTestDataCreator(tmss_test_env.django_server.url, (tm class SchedulingTest(unittest.TestCase): def test_schedule_observation_subtask_with_enough_resources_available(self): - subtask_data = test_data_creator.Subtask() - subtask = test_data_creator.post_data_and_get_response_as_json_object(subtask_data, '/subtask/') - subtask_id = subtask['id'] - with tmss_test_env.create_tmss_client() as client: + subtask_template = client.get_subtask_template("observationcontrol schema") + + subtask_data = test_data_creator.Subtask(specifications_template_url=subtask_template['url'], + specifications_doc=get_default_json_object_for_schema(subtask_template['schema'])) + subtask = test_data_creator.post_data_and_get_response_as_json_object(subtask_data, '/subtask/') + subtask_id = subtask['id'] + client.set_subtask_status(subtask_id, 'defined') client.schedule_subtask(subtask_id) + if __name__ == "__main__": os.environ['TZ'] = 'UTC' unittest.main() -- GitLab