ruff

Author: cunla

docs/changelog.md

@@ -4,7 +4,7 @@
 
 Refactor the code to make it more organized and easier to maintain. This includes:
 - All types are under `types`.
-- 
+- A
 
 ## v4.0.0b2 🌈
 

scheduler/settings.py

@@ -4,7 +4,7 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 
-from scheduler.types import SchedulerConfiguration, Broker, QueueConfiguration
+from scheduler.types import SchedulerConfiguration, QueueConfiguration
 
 logger = logging.getLogger("scheduler")
 logging.basicConfig(level=logging.DEBUG)
@@ -22,8 +22,8 @@ def conf_settings():
     global SCHEDULER_CONFIG
 
     app_queues = getattr(settings, "SCHEDULER_QUEUES", None)
-    if app_queues is None:
-        raise ImproperlyConfigured("You have to define SCHEDULER_QUEUES in settings.py")
+    if app_queues is None or not isinstance(app_queues, dict):
+        raise ImproperlyConfigured("You have to define SCHEDULER_QUEUES in settings.py as dict")
 
     for queue_name, queue_config in app_queues.items():
         if isinstance(queue_config, QueueConfiguration):
@@ -38,10 +38,6 @@ def conf_settings():
         return
     if not isinstance(user_settings, dict):
         raise ImproperlyConfigured("SCHEDULER_CONFIG should be a SchedulerConfiguration or dict")
-    if "FAKEREDIS" in user_settings:
-        logger.warning("Configuration using FAKEREDIS is deprecated. Use BROKER='fakeredis' instead")
-        user_settings["BROKER"] = Broker.FAKEREDIS if user_settings["FAKEREDIS"] else Broker.REDIS
-        user_settings.pop("FAKEREDIS")
     for k in user_settings:
         if k not in SCHEDULER_CONFIG.__annotations__:
             raise ImproperlyConfigured(f"Unknown setting {k} in SCHEDULER_CONFIG")

scheduler/tests/test_internals.py

@@ -1,5 +1,7 @@
 from datetime import timedelta
 
+from django.core.exceptions import ImproperlyConfigured
+from django.test import override_settings
 from django.utils import timezone
 
 from scheduler.helpers.callback import Callback, CallbackSetupError
@@ -37,3 +39,41 @@ def test_callback_bad_arguments(self):
         with self.assertRaises(CallbackSetupError) as cm:
             Callback(1)
         self.assertEqual(str(cm.exception), "Callback `func` must be a string or function, received 1")
+
+
+class TestConfSettings(SchedulerBaseCase):
+    @override_settings(SCHEDULER_CONFIG=[])
+    def test_conf_settings__bad_scheduler_config(self):
+        from scheduler import settings
+
+        with self.assertRaises(ImproperlyConfigured) as cm:
+            settings.conf_settings()
+
+        self.assertEqual(str(cm.exception), "SCHEDULER_CONFIG should be a SchedulerConfiguration or dict")
+
+    @override_settings(SCHEDULER_QUEUES=[])
+    def test_conf_settings__bad_scheduler_queues_config(self):
+        from scheduler import settings
+
+        with self.assertRaises(ImproperlyConfigured) as cm:
+            settings.conf_settings()
+
+        self.assertEqual(str(cm.exception), "You have to define SCHEDULER_QUEUES in settings.py as dict")
+
+    @override_settings(SCHEDULER_QUEUES={"default": []})
+    def test_conf_settings__bad_queue_config(self):
+        from scheduler import settings
+
+        with self.assertRaises(ImproperlyConfigured) as cm:
+            settings.conf_settings()
+
+        self.assertEqual(str(cm.exception), "Queue default configuration should be a QueueConfiguration or dict")
+
+    @override_settings(SCHEDULER_CONFIG={"UNKNOWN_SETTING": 10})
+    def test_conf_settings__unknown_setting(self):
+        from scheduler import settings
+
+        with self.assertRaises(ImproperlyConfigured) as cm:
+            settings.conf_settings()
+
+        self.assertEqual(str(cm.exception), "Unknown setting UNKNOWN_SETTING in SCHEDULER_CONFIG")