Don't set last_run_at to now() when setting DJANGO_CELERY_BEAT_TZ_AWARE is False in ModelEntry save method (#311)

Author: simongartz

django_celery_beat/schedulers.py

@@ -163,9 +163,6 @@ def save(self):
         for field in self.save_fields:
             setattr(obj, field, getattr(self.model, field))
 
-        if not getattr(settings, 'DJANGO_CELERY_BEAT_TZ_AWARE', True):
-            obj.last_run_at = datetime.datetime.now()
-
         obj.save()
 
     @classmethod

t/unit/test_schedulers.py

@@ -178,6 +178,40 @@ def test_entry_is_due__no_use_tz(self):
         if hasattr(time, "tzset"):
             time.tzset()
 
+    @override_settings(
+        USE_TZ=False,
+        DJANGO_CELERY_BEAT_TZ_AWARE=False
+    )
+    @pytest.mark.usefixtures('depends_on_current_app')
+    @timezone.override('Europe/Berlin')
+    @pytest.mark.celery(timezone='Europe/Berlin')
+    def test_entry_and_model_last_run_at_with_utc_no_use_tz(self, monkeypatch):
+        old_tz = os.environ.get("TZ")
+        os.environ["TZ"] = "Europe/Berlin"
+        if hasattr(time, "tzset"):
+            time.tzset()
+        assert self.app.timezone.zone == 'Europe/Berlin'
+        # simulate last_run_at from DB - not TZ aware but localtime
+        right_now = datetime.utcnow()
+        # make sure to use fixed date time
+        monkeypatch.setattr(self.Entry, '_default_now', lambda o: right_now)
+        m = self.create_model_crontab(
+            crontab(minute='*/10')
+        )
+        m.save()
+        e = self.Entry(m, app=self.app)
+        e.save()
+        m.refresh_from_db()
+
+        assert m.last_run_at == e.last_run_at
+
+        if old_tz is not None:
+            os.environ["TZ"] = old_tz
+        else:
+            del os.environ["TZ"]
+        if hasattr(time, "tzset"):
+            time.tzset()
+
     @override_settings(
         USE_TZ=False,
         DJANGO_CELERY_BEAT_TZ_AWARE=False,