diff --git a/SAS/TMSS/backend/test/t_adapter.py b/SAS/TMSS/backend/test/t_adapter.py index d0bb9667f7f0430fdd050553328da2ed6b8c52c1..0df55c22800bde4744afe1663aea17fdc5cb4892 100755 --- a/SAS/TMSS/backend/test/t_adapter.py +++ b/SAS/TMSS/backend/test/t_adapter.py @@ -45,7 +45,7 @@ rest_data_creator = TMSSRESTTestDataCreator(BASE_URL, AUTH) from lofar.sas.tmss.tmss.tmssapp import models from lofar.sas.tmss.tmss.exceptions import SubtaskInvalidStateException from lofar.sas.tmss.tmss.tmssapp.adapters.parset import convert_to_parset, convert_to_parset_dict -from lofar.common.json_utils import get_default_json_object_for_schema +from lofar.common.json_utils import get_default_json_object_for_schema, add_defaults_to_json_object_for_schema from lofar.sas.tmss.tmss.tmssapp.adapters.sip import generate_sip_for_dataproduct from lofar.sas.tmss.tmss.tmssapp.adapters.feedback import append_to_subtask_raw_feedback, process_feedback_into_subtask_dataproducts, process_feedback_for_subtask_and_set_to_finished_if_complete, reprocess_raw_feedback_for_subtask_and_set_to_finished_if_complete from lofar.lta.sip import constants @@ -202,22 +202,20 @@ class ObservationParsetAdapterTest(unittest.TestCase): self.assertEqual(4, estimations["estimates"][1]["output_files"]["is"][0]["properties"]["nr_of_is_stokes"]) class PulsarPipelineParsetAdapterTest(unittest.TestCase): - def get_default_specifications(self): + def create_subtask(self, specifications_doc={}): subtask_template = models.SubtaskTemplate.objects.get(name='pulsar pipeline') - return get_default_json_object_for_schema(subtask_template.schema) + specifications_doc = add_defaults_to_json_object_for_schema(specifications_doc, subtask_template.schema) - def create_subtask(self, specifications_doc): - subtask_template = models.SubtaskTemplate.objects.get(name='pulsar pipeline') subtask_data = Subtask_test_data(subtask_template=subtask_template, specifications_doc=specifications_doc) subtask:models.Subtask = models.Subtask.objects.create(**subtask_data) + + subtask.task_blueprints.set([models.TaskBlueprint.objects.create(**TaskBlueprint_test_data())]) subtask_output = models.SubtaskOutput.objects.create(**SubtaskOutput_test_data(subtask=subtask)) dataproduct:models.Dataproduct = models.Dataproduct.objects.create(**Dataproduct_test_data(producer=subtask_output)) return subtask def test_pulp(self): - specifications_doc = self.get_default_specifications() - - subtask = self.create_subtask(specifications_doc) + subtask = self.create_subtask() parset = convert_to_parset_dict(subtask) logger.info("test_pulp parset:",parset)