diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py index e943509d30488872845ca114d50fd871f4ba28f1..728d97466026dd99b5fb2247c222be2cddccf187 100644 --- a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py +++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.9 on 2021-08-24 11:37 +# Generated by Django 3.0.9 on 2021-08-24 14:29 from django.conf import settings import django.contrib.auth.models diff --git a/SAS/TMSS/backend/test/t_subtasks.py b/SAS/TMSS/backend/test/t_subtasks.py index 59e1fed352caf57a3b2427ca33fd8b5ad50879a2..676dac6223bb58372aca51f07937fe187b3c1a3d 100755 --- a/SAS/TMSS/backend/test/t_subtasks.py +++ b/SAS/TMSS/backend/test/t_subtasks.py @@ -198,16 +198,19 @@ class SubTasksCreationFromTaskBluePrint(unittest.TestCase): self.assertEqual("defined", str(subtask.state)) self.assertEqual("observation control", str(subtask.specifications_template.name)) self.assertEqual("observation", str(subtask.specifications_template.type)) + self.assertTrue(subtask.primary) # Next call requires an observation subtask already created subtask = create_qafile_subtask_from_task_blueprint(task_blueprint) self.assertEqual("defined", str(subtask.state)) self.assertEqual("QA file conversion", str(subtask.specifications_template.name)) self.assertEqual("qa_files", str(subtask.specifications_template.type)) + self.assertFalse(subtask.primary) # Next call requires an qaplots subtask already created subtask = create_qaplots_subtask_from_task_blueprint(task_blueprint) self.assertEqual("defined", str(subtask.state)) self.assertEqual("QA plots", str(subtask.specifications_template.name)) self.assertEqual("qa_plots", str(subtask.specifications_template.type)) + self.assertFalse(subtask.primary) # Next call will fail due to missing task relation with self.assertRaises(SubtaskCreationException): create_preprocessing_subtask_from_task_blueprint(task_blueprint_preprocessing) @@ -217,6 +220,7 @@ class SubTasksCreationFromTaskBluePrint(unittest.TestCase): self.assertEqual("defined", str(subtask.state)) self.assertEqual("preprocessing pipeline", str(subtask.specifications_template.name)) self.assertEqual("pipeline", str(subtask.specifications_template.type)) + self.assertTrue(subtask.primary) def test_create_subtasks_from_task_blueprint_succeed(self): """ @@ -292,6 +296,7 @@ class SubTasksCreationFromTaskBluePrintCalibrator(unittest.TestCase): # assert target subtask still in defining state self.assertEqual("defining", str(subtask_1.state)) + self.assertTrue(subtask_1.primary) subtask_2 = create_observation_control_subtask_from_task_blueprint(cal_task_blueprint) @@ -304,6 +309,7 @@ class SubTasksCreationFromTaskBluePrintCalibrator(unittest.TestCase): # assert the subtask is now in defined state self.assertEqual("defined", str(subtask_2.state)) + self.assertTrue(subtask_2.primary) # assert the subtask references both tasks self.assertEqual(subtask_1.task_blueprints.count(), 2) @@ -434,6 +440,7 @@ class SubTaskCreationFromTaskBlueprintPipelines(unittest.TestCase): self.assertEqual("defined", str(subtask.state)) self.assertEqual("pulsar pipeline", str(subtask.specifications_template.name)) self.assertEqual(models.SubtaskType.Choices.PIPELINE.value, str(subtask.specifications_template.type)) + self.assertTrue(subtask.primary) class SubTaskCreationFromTaskBlueprintIngest(unittest.TestCase): @@ -453,6 +460,7 @@ class SubTaskCreationFromTaskBlueprintIngest(unittest.TestCase): self.assertEqual("defined", str(subtask.state)) self.assertEqual("ingest control", str(subtask.specifications_template.name)) self.assertEqual(models.SubtaskType.Choices.INGEST.value, str(subtask.specifications_template.type)) + self.assertTrue(subtask.primary) class SubtaskInputSelectionFilteringTest(unittest.TestCase):