From 268c800bce7be79e4b5373f971db156b689eeb0c Mon Sep 17 00:00:00 2001 From: Jorrit Schaap <schaap@astron.nl> Date: Fri, 24 Nov 2023 10:18:58 +0100 Subject: [PATCH] log constraint doc. fixed blinking test which failed in 3/60 minutes per hour --- .../services/scheduling/test/t_dynamic_scheduling.py | 10 +++------- 1 file changed, 3 insertions(+), 7 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 8b4de39a593..4b7c029776e 100755 --- a/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py +++ b/SAS/TMSS/backend/services/scheduling/test/t_dynamic_scheduling.py @@ -1576,13 +1576,10 @@ class TestDynamicScheduling(BaseDynamicSchedulingTestCase): """ Test a simple observation with the 'at' constraint """ - # JS: set loglevel to DEBUG to find out why this test is blinking on gitlab cicd - logging.getLogger('lofar.sas.tmss.services.scheduling').level = logging.DEBUG - scheduling_unit_draft = self.create_simple_observation_scheduling_unit('scheduling_unit for at constraint') # Clear/set constraints - at = datetime.utcnow().replace(minute=0, second=0, microsecond=0) + timedelta(hours=1) + at = datetime.utcnow().replace(minute=0, second=0, microsecond=0) + timedelta(hours=2) scheduling_unit_draft.scheduling_constraints_doc = {'scheduler': 'dynamic', 'time': {'at': at.isoformat()} } scheduling_unit_draft.save() @@ -1599,6 +1596,8 @@ class TestDynamicScheduling(BaseDynamicSchedulingTestCase): cycle.save() scheduling_unit_blueprint = create_scheduling_unit_blueprint_and_tasks_and_subtasks_from_scheduling_unit_draft(scheduling_unit_draft) + logger.info("test_simple_observation_with_at_constraint: %s", scheduling_unit_blueprint.scheduling_constraints_doc) + scheduled_scheduling_units = self.scheduler.do_dynamic_schedule() self.assertEqual(1, len(scheduled_scheduling_units)) scheduled_scheduling_unit = scheduled_scheduling_units[0] @@ -1609,9 +1608,6 @@ class TestDynamicScheduling(BaseDynamicSchedulingTestCase): self.assertEqual(scheduled_scheduling_unit.status.value, 'scheduled') self.assertEqual(scheduled_scheduling_unit.scheduled_start_time, at) - # JS: reset loglevel - logging.getLogger('lofar.sas.tmss.services.scheduling').level = logging.INFO - def test_two_simple_observations_with_at_constraint_one_after_the_other(self): """ -- GitLab