diff --git a/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py b/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py index 88b0f6cc13625f5bbc25d282b6de9a20739f62db..71d2e99e09e55ad00c0ec625c06c1106ffaa0de2 100755 --- a/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py +++ b/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py @@ -1432,7 +1432,7 @@ class TestFixedTimeScheduling(BaseDynamicSchedulingTestCase): scheduling_unit_spec_B['tasks']['Observation']['specifications_doc']['station_configuration']['SAPs'][0]['digital_pointing']['angle2'] = Angle('60 degrees').rad scheduling_unit_spec_B['tasks']['Observation']['specifications_doc']['station_configuration']['SAPs'][0]['digital_pointing']['target'] = 'dynamic_B' scheduling_unit_spec_B['scheduling_constraints_doc']['scheduler'] = 'dynamic' - scheduling_unit_spec_B['scheduling_constraints_doc']['sky']['transit_offset'] = {'from': -9000, 'to': 9000} + scheduling_unit_spec_B['scheduling_constraints_doc']['sky'] = {'transit_offset': {'from': -9000, 'to': 9000}} scheduling_unit_draft_B = update_task_graph_from_specifications_doc(scheduling_unit_draft_B, scheduling_unit_spec_B) scheduling_unit_blueprint_B = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft_B) @@ -1447,10 +1447,9 @@ class TestFixedTimeScheduling(BaseDynamicSchedulingTestCase): scheduling_unit_blueprint_B.refresh_from_db() self.assertEqual(models.SchedulingUnitStatus.Choices.SCHEDULED.value, scheduling_unit_blueprint_B.status.value) - # check that the bug has been solved: unitB should NOT be overlapping with unitA, and be scheduled before it. + # check that the bug has been solved: unitB should NOT be overlapping with unitA. self.assertFalse(scheduling_unit_blueprint_B.scheduled_start_time > scheduling_unit_blueprint_A.scheduled_start_time and scheduling_unit_blueprint_B.scheduled_start_time < scheduling_unit_blueprint_A.scheduled_stop_time) - self.assertTrue(scheduling_unit_blueprint_B.scheduled_stop_time < scheduling_unit_blueprint_A.scheduled_start_time) # try to schedule the B unit... self.scheduler.do_dynamic_schedule() @@ -1460,10 +1459,9 @@ class TestFixedTimeScheduling(BaseDynamicSchedulingTestCase): self.assertEqual(models.SchedulingUnitStatus.Choices.SCHEDULED.value, scheduling_unit_blueprint_A.status.value) self.assertEqual(at, scheduling_unit_blueprint_A.scheduled_start_time) - # check that the bug has been solved: unitB should NOT be overlapping with unitA, and be scheduled before it. + # check that the bug has been solved: unitB should NOT be overlapping with unitA. self.assertFalse(scheduling_unit_blueprint_B.scheduled_start_time > scheduling_unit_blueprint_A.scheduled_start_time and scheduling_unit_blueprint_B.scheduled_start_time < scheduling_unit_blueprint_A.scheduled_stop_time) - self.assertTrue(scheduling_unit_blueprint_B.scheduled_stop_time < scheduling_unit_blueprint_A.scheduled_start_time) def test_bug_fix_TMSS_2563_schedule_B_priority_units_incorrect_start_time(self):