Create queue fixture

tests/conftest.py

@@ -9,8 +9,7 @@ from tempfile import TemporaryDirectory
 
 from atst.app import make_app, make_config
 from atst.database import db as _db
-from atst.domain.auth import logout
-from atst.queue import queue
+from atst.queue import queue as atst_queue
 import tests.factories as factories
 from tests.mocks import PDF_FILENAME
 
@@ -136,3 +135,10 @@ def extended_financial_verification_data(pdf_upload):
         "clin_2003": "7000",
         "task_order": pdf_upload,
     }
+
+
+@pytest.fixture(scope="function")
+def queue():
+    _queue = atst_queue
+    yield _queue
+    _queue.get_queue().empty()

tests/test_queue.py

@@ -1,17 +1,5 @@
-import pytest
-from atst.queue import queue
-
-# ensure queue is always empty for unit testing
-@pytest.fixture(scope="function", autouse=True)
-def reset_queue():
-    queue.get_queue().empty()
-    yield
-    queue.get_queue().empty()
-
-
-def test_send_mail():
-    initial = len(queue.get_queue())
+def test_send_mail(queue):
     queue.send_mail(
         ["lordvader@geocities.net"], "death start", "how is it coming along?"
     )
-    assert len(queue.get_queue()) == initial + 1
+    assert len(queue.get_queue()) == 1