diff --git a/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py b/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py index c490d5f9376da171ceb97ea45ea30fc846bf2a2e..6bbcfbe64c4ef2dc83126df646e447c87ac8b6c8 100755 --- a/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py +++ b/SAS/TMSS/backend/test/t_tmssapp_specification_REST_API.py @@ -3151,7 +3151,7 @@ class SubmitTriggerTestCase(unittest.TestCase): project = models.Project.objects.create(**Project_test_data(can_trigger=True)) scheduling_set = models.SchedulingSet.objects.create(**SchedulingSet_test_data("scheduling set", project=project)) - for strategy_template in models.SchedulingUnitObservingStrategyTemplate.objects.filter(name="UC1 CTC+pipelines").all(): + for strategy_template in models.SchedulingUnitObservingStrategyTemplate.objects.all(): with tmss_test_env.create_tmss_client() as client: logger.info("test_submit_trigger_for_all_strategy_templates: checking template '%s'", strategy_template.name) trigger_doc = client.get_trigger_specification_doc_for_scheduling_unit_observing_strategy_template(strategy_template.name, strategy_template.version) @@ -3164,12 +3164,11 @@ class SubmitTriggerTestCase(unittest.TestCase): self.assertEqual(scheduling_set.id, result['scheduling_set_id']) self.assertEqual(strategy_template.id, result['observation_strategy_template_id']) - # TODO: fix merging of overrides into spec, and enable check below. - # trigger_doc['mode'] = 'run' - # result = client.submit_trigger(trigger_doc) - # self.assertIsNotNone(result) - # self.assertTrue('scheduling_unit_blueprint' in result['url']) # it's a blueprint (because the more is "run") - # self.assertEqual('schedulable', result['status']) + trigger_doc['mode'] = 'run' + result = client.submit_trigger(trigger_doc) + self.assertIsNotNone(result) + self.assertTrue('scheduling_unit_blueprint' in result['url']) # it's a blueprint (because the more is "run") + self.assertEqual('schedulable', result['status']) # todo: move to t_permissions (I tried, but it broke)