From f3be2d76eac2b33621e35db1c98f24824f57a9e6 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 29 Oct 2018 12:01:45 -0400 Subject: [PATCH] Create queue fixture --- tests/conftest.py | 10 ++++++++-- tests/test_queue.py | 16 ++-------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 50a555e7..c1821b96 100644 --- a/tests/conftest.py +++ b/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() diff --git a/tests/test_queue.py b/tests/test_queue.py index da6069d4..eb377bc9 100644 --- a/tests/test_queue.py +++ b/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