From 8a207b3bc64b5b32dba9264e4c095451ae8a6c3a Mon Sep 17 00:00:00 2001 From: dandds Date: Mon, 15 Oct 2018 16:11:14 -0400 Subject: [PATCH] restore environment-based queue names --- atst/app.py | 1 + atst/queue.py | 2 ++ tests/test_queue.py | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/atst/app.py b/atst/app.py index 68ebd331..8bfcb134 100644 --- a/atst/app.py +++ b/atst/app.py @@ -98,6 +98,7 @@ def map_config(config): "default", "PERMANENT_SESSION_LIFETIME" ), "RQ_REDIS_URL": config["default"]["REDIS_URI"], + "RQ_QUEUES": ["atat_{}".format(ENV.lower())], } diff --git a/atst/queue.py b/atst/queue.py index 0b92bf91..e036a642 100644 --- a/atst/queue.py +++ b/atst/queue.py @@ -24,11 +24,13 @@ class ATSTQueue(RQ): def _queue_job(self, function, *args, **kwargs): self.get_queue().enqueue(function, *args, **kwargs) + # pylint: disable=pointless-string-statement """Instance methods to queue up application-specific jobs.""" def send_mail(self, to, subject, body): self._queue_job(ATSTQueue._send_mail, to, subject, body) + # pylint: disable=pointless-string-statement """Class methods to actually perform the work. Must be a class method (or a module-level function) because we being able diff --git a/tests/test_queue.py b/tests/test_queue.py index 1754023e..da6069d4 100644 --- a/tests/test_queue.py +++ b/tests/test_queue.py @@ -1,5 +1,5 @@ import pytest -from atst.queue import queue, send_mail +from atst.queue import queue # ensure queue is always empty for unit testing @pytest.fixture(scope="function", autouse=True) @@ -11,7 +11,7 @@ def reset_queue(): def test_send_mail(): initial = len(queue.get_queue()) - send_mail.queue( + queue.send_mail( ["lordvader@geocities.net"], "death start", "how is it coming along?" ) assert len(queue.get_queue()) == initial + 1