From 7210bec86916cfe93ef8e3ca77c29a8b219cfb15 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 2 Sep 2021 18:33:22 +0200
Subject: [PATCH] TMSS-917: adapted and fixed various tests now that we
reverted to a single parent TaskBlueprint for a Subtask.
---
SAS/TMSS/backend/test/t_subtask_validation.py | 4 ++--
SAS/TMSS/backend/test/t_subtasks.py | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/SAS/TMSS/backend/test/t_subtask_validation.py b/SAS/TMSS/backend/test/t_subtask_validation.py
index 2abd4418e53..7d7dc1d1fb5 100755
--- a/SAS/TMSS/backend/test/t_subtask_validation.py
+++ b/SAS/TMSS/backend/test/t_subtask_validation.py
@@ -68,11 +68,11 @@ class SubtaskValidationTest(unittest.TestCase):
subtask_template = self.create_subtask_template(minimal_json_schema())
specifications_doc = '{ this is not a json object }'
subtask_data = Subtask_test_data(subtask_template=subtask_template, specifications_doc=specifications_doc,
- cluster=self.cluster, state=self.state)
+ cluster=self.cluster, state=self.state,
+ task_blueprint=self.task_blueprint)
with self.assertRaises(SchemaValidationException) as context:
subtask = models.Subtask.objects.create(**subtask_data)
- subtask.task_blueprints.set([self.task_blueprint])
self.assertTrue('invalid json' in str(context.exception).lower())
def test_validate_correlator_schema_with_valid_specification(self):
diff --git a/SAS/TMSS/backend/test/t_subtasks.py b/SAS/TMSS/backend/test/t_subtasks.py
index 676dac6223b..3606c045aa6 100755
--- a/SAS/TMSS/backend/test/t_subtasks.py
+++ b/SAS/TMSS/backend/test/t_subtasks.py
@@ -50,9 +50,8 @@ def create_subtask_object_for_testing(subtask_type_value):
"""
template_type = models.SubtaskType.objects.get(value=subtask_type_value)
subtask_template_obj = create_subtask_template_for_testing(template_type)
- subtask_data = Subtask_test_data(subtask_template=subtask_template_obj)
+ subtask_data = Subtask_test_data(subtask_template=subtask_template_obj, task_blueprint=models.TaskBlueprint.objects.create(**TaskBlueprint_test_data()))
subtask = models.Subtask.objects.create(**subtask_data)
- subtask.task_blueprints.set([models.TaskBlueprint.objects.create(**TaskBlueprint_test_data())])
return subtask
def create_subtask_template_for_testing(template_type: object):
--
GitLab