From 09eeff9e5fd6f26f837a8447871b845795ed9c18 Mon Sep 17 00:00:00 2001 From: ali rafiei <103249712+alirafiei75@users.noreply.github.com> Date: Fri, 3 Jan 2025 12:22:16 +0330 Subject: [PATCH] exempt 4 in the morning from exclusion because of cleanup task, also refactor all_as_schedule test --- django_celery_beat/schedulers.py | 1 + t/unit/test_schedulers.py | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/django_celery_beat/schedulers.py b/django_celery_beat/schedulers.py index 092904e5..f2ea4bc9 100644 --- a/django_celery_beat/schedulers.py +++ b/django_celery_beat/schedulers.py @@ -410,6 +410,7 @@ def get_excluded_hours_for_crontab_tasks(): str(current_hour).zfill(2), str(current_hour), str(next_hour).zfill(2), str(next_hour), str(previous_hour).zfill(2), str(previous_hour), + str(4), "04", # celery's default cleanup task } # Filter out 'should be considered' hours diff --git a/t/unit/test_schedulers.py b/t/unit/test_schedulers.py index 544ac4bd..9f878ec3 100644 --- a/t/unit/test_schedulers.py +++ b/t/unit/test_schedulers.py @@ -455,12 +455,13 @@ def setup_scheduler(self, app): solar('solar_noon', 48.06, 12.86)) self.m4.save() self.m4.refresh_from_db() - - dt_aware = make_aware(datetime(day=26, - month=7, - year=3000, - hour=1, - minute=0)) # future time + now = datetime.now() + two_minutes_later = now + timedelta(minutes=2) + dt_aware = make_aware(datetime(day=two_minutes_later.day, + month=two_minutes_later.month, + year=two_minutes_later.year, + hour=two_minutes_later.hour, + minute=two_minutes_later.minute)) # future time self.m6 = self.create_model_clocked( clocked(dt_aware) )