Use override_settings in tests where we can now do so

This slightly changes the behaviour of the mock_workers helpers,
however the default is an empty dictionary so this feels like a
reasonable trade-off for using the more standard override_settings
util.

Author: PeterJCLaw

tests/test_pause_resume.py

@@ -1,11 +1,11 @@
 import io
 import datetime
-import unittest
 from unittest import mock
 
 import fakeredis
 import freezegun
 
+from django.test import SimpleTestCase, override_settings
 from django.core.management import call_command, CommandError
 
 from django_lightweight_queue.types import QueueName
@@ -18,7 +18,7 @@
 )
 
 
-class PauseResumeTests(unittest.TestCase):
+class PauseResumeTests(SimpleTestCase):
     longMessage = True
 
     def assertPaused(self, queue: QueueName, context: str) -> None:
@@ -49,11 +49,8 @@ def setUp(self) -> None:
 
         super().setUp()
 
-    # Can't use override_settings due to the copying of the settings values into
-    # module values at startup.
-    @mock.patch(
-        'django_lightweight_queue.app_settings.Defaults.BACKEND',
-        new='django_lightweight_queue.backends.redis.RedisBackend',
+    @override_settings(
+        LIGHTWEIGHT_QUEUE_BACKEND='django_lightweight_queue.backends.redis.RedisBackend',
     )
     def test_pause_resume(self) -> None:
         QUEUE = QueueName('test-pauseable-queue')

tests/test_reliable_redis_backend.py

@@ -8,6 +8,8 @@
 
 import fakeredis
 
+from django.test import SimpleTestCase, override_settings
+
 from django_lightweight_queue.job import Job
 from django_lightweight_queue.types import QueueName
 from django_lightweight_queue.backends.reliable_redis import (
@@ -18,7 +20,7 @@
 from .mixins import RedisCleanupMixin
 
 
-class ReliableRedisDeduplicationTests(RedisCleanupMixin, unittest.TestCase):
+class ReliableRedisDeduplicationTests(RedisCleanupMixin, SimpleTestCase):
     longMessage = True
     prefix = settings.LIGHTWEIGHT_QUEUE_REDIS_PREFIX
 
@@ -49,9 +51,8 @@ def mock_workers(self, workers: Mapping[str, int]) -> Iterator[None]:
         with unittest.mock.patch(
             'django_lightweight_queue.utils._accepting_implied_queues',
             new=False,
-        ), unittest.mock.patch.dict(
-            'django_lightweight_queue.app_settings.app_settings.WORKERS',
-            workers,
+        ), override_settings(
+            LIGHTWEIGHT_QUEUE_WORKERS=workers,
         ):
             yield
 

tests/test_task.py

@@ -5,6 +5,8 @@
 
 import fakeredis
 
+from django.test import SimpleTestCase, override_settings
+
 from django_lightweight_queue import task
 from django_lightweight_queue.types import QueueName, WorkerNumber
 from django_lightweight_queue.utils import get_path, get_backend
@@ -20,7 +22,8 @@ def dummy_task(num: int) -> None:
     pass
 
 
-class TaskTests(unittest.TestCase):
+@override_settings(LIGHTWEIGHT_QUEUE_BACKEND='test-backend')
+class TaskTests(SimpleTestCase):
     longMessage = True
     prefix = settings.LIGHTWEIGHT_QUEUE_REDIS_PREFIX
 
@@ -29,9 +32,8 @@ def mock_workers(self, workers: Mapping[str, int]) -> Iterator[None]:
         with unittest.mock.patch(
             'django_lightweight_queue.utils._accepting_implied_queues',
             new=False,
-        ), unittest.mock.patch.dict(
-            'django_lightweight_queue.app_settings.Defaults.WORKERS',
-            workers,
+        ), override_settings(
+            LIGHTWEIGHT_QUEUE_WORKERS=workers,
         ):
             yield
 
@@ -53,12 +55,6 @@ def mocked_get_path(path: str) -> Any:
                 return lambda: self.backend
             return get_path(path)
 
-        patch = mock.patch(
-            'django_lightweight_queue.app_settings.Defaults.BACKEND',
-            new='test-backend',
-        )
-        patch.start()
-        self.addCleanup(patch.stop)
         patch = mock.patch(
             'django_lightweight_queue.utils.get_path',
             side_effect=mocked_get_path,