From 5721f8a89a015ad50930e66d3d9b9fc4dded81b5 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 19 Aug 2022 10:54:10 +0200
Subject: [PATCH] TMSS-1806: removed obsolete (skipped) test
---
.../scheduling/test/t_dynamic_scheduling.py | 71 -------------------
1 file changed, 71 deletions(-)
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 ead280ba06b..030156f2459 100755
--- a/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py
+++ b/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py
@@ -1976,77 +1976,6 @@ class TestTriggers(BaseDynamicSchedulingTestCase):
#self.assertEqual(triggered_scheduling_unit_blueprint.status.value, 'schedulable') # todo: TMSS-704: Make this pass. Currently goes to error state.
- @unittest.skip("ToDo: FIX")
- @mock.patch("lofar.sas.tmss.services.scheduling.dynamic_scheduling.cancel_subtask")
- def test_triggered_scheduling_unit_gets_scheduled_in_correct_trigger_priority_order(self, cancel_mock):
-
- # create three regular scheduling_units, two with high trigger priority, one with lower
- # also, give two units a lower unit_rank, so it is deterministic which one will be scheduled from the regular candidates
- scheduling_unit_draft_high1 = self.create_simple_observation_scheduling_unit(
- "scheduling unit for %s" % self._testMethodName,
- scheduling_set=self.scheduling_set_high_trigger_priority,
- interrupts_telescope=False)
- regular_scheduling_unit_blueprint_high1 = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft_high1)
-
- scheduling_unit_draft_high2 = self.create_simple_observation_scheduling_unit(
- "scheduling unit for %s" % self._testMethodName,
- scheduling_set=self.scheduling_set_high_trigger_priority,
- interrupts_telescope=False,
- unit_rank=models.SchedulingUnitRank.LOWEST.value)
- regular_scheduling_unit_blueprint_high2 = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft_high2)
-
- scheduling_unit_draft_low = self.create_simple_observation_scheduling_unit(
- "scheduling unit for %s" % self._testMethodName,
- scheduling_set=self.scheduling_set,
- interrupts_telescope=False,
- unit_rank=models.SchedulingUnitRank.LOWEST.value)
- regular_scheduling_unit_blueprint_low = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft_low)
-
-
- scheduled_scheduling_unit = self.scheduler.do_dynamic_schedule()
-
- # Assert the scheduling_unit has been scheduled
- self.assertIsNotNone(scheduled_scheduling_unit)
- self.assertEqual(scheduled_scheduling_unit.id, regular_scheduling_unit_blueprint_high1.id)
- regular_scheduling_unit_blueprint_high1.refresh_from_db()
- self.assertEqual(regular_scheduling_unit_blueprint_high1.status.value, 'scheduled')
-
- # put first obs to started state
- subtask = scheduled_scheduling_unit.task_blueprints.first().subtasks.first()
- subtask.state = models.SubtaskState.objects.get(value='starting')
- subtask.save()
- subtask.state = models.SubtaskState.objects.get(value='started')
- subtask.save()
-
- # add a triggered scheduling_unit with same priority
- scheduling_unit_draft_trigger = self.create_simple_observation_scheduling_unit(
- "triggered scheduling unit for %s" % self._testMethodName,
- scheduling_set=self.scheduling_set_high_trigger_priority,
- interrupts_telescope=True)
- triggered_scheduling_unit_blueprint = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft_trigger)
-
- scheduled_scheduling_unit = self.scheduler.do_dynamic_schedule()
-
- # assert that the subtask has NOT been cancelled and is still in state 'started', and its SU is observing
- cancel_mock.assert_not_called()
- self.assertEqual(subtask.state.value, 'started')
- regular_scheduling_unit_blueprint_high1.refresh_from_db()
- self.assertEqual(regular_scheduling_unit_blueprint_high1.status.value, 'observing')
-
- # Assert that the new triggered scheduling_unit has been scheduled, and starts in between the same and lower
- # priority units
- self.assertIsNotNone(scheduled_scheduling_unit)
- triggered_scheduling_unit_blueprint.refresh_from_db()
- regular_scheduling_unit_blueprint_high1.refresh_from_db()
- regular_scheduling_unit_blueprint_high2.refresh_from_db()
- regular_scheduling_unit_blueprint_low.refresh_from_db()
- self.assertEqual(triggered_scheduling_unit_blueprint.status.value, 'scheduled')
- self.assertEqual(regular_scheduling_unit_blueprint_high2.status.value, 'scheduled')
- self.assertEqual(regular_scheduling_unit_blueprint_low.status.value, 'schedulable')
- self.assertGreater(regular_scheduling_unit_blueprint_low.scheduled_start_time, triggered_scheduling_unit_blueprint.scheduled_stop_time)
- self.assertGreater(triggered_scheduling_unit_blueprint.scheduled_start_time, regular_scheduling_unit_blueprint_high2.scheduled_stop_time)
- self.assertGreater(regular_scheduling_unit_blueprint_high2.scheduled_start_time, regular_scheduling_unit_blueprint_high1.scheduled_stop_time)
-
@mock.patch("lofar.sas.tmss.services.scheduling.dynamic_scheduling.cancel_subtask")
def test_triggered_scheduling_unit_goes_to_unschedulable_if_it_cannot_cancel_and_does_not_fit(self, cancel_mock):
--
GitLab