From 456cb4157d4736ff6657b3730ee689fa0adbc7cc Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Tue, 17 May 2022 17:27:58 +0200 Subject: [PATCH] refactoring: move --- test/conftest.py | 1 + test/fixtures/consumer.py | 30 ++++++++++++++++++++++++++++++ test/integration_tests/__init__.py | 0 test/unit_tests/consumer_test.py | 26 -------------------------- 4 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 test/fixtures/consumer.py create mode 100644 test/integration_tests/__init__.py diff --git a/test/conftest.py b/test/conftest.py index d5c3f5b..8c19604 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -25,6 +25,7 @@ logger = logging.getLogger() pytest_plugins = [ + "test.fixtures.consumer", "test.fixtures.input", "test.fixtures.pdf", "test.fixtures.server", diff --git a/test/fixtures/consumer.py b/test/fixtures/consumer.py new file mode 100644 index 0000000..2754fcd --- /dev/null +++ b/test/fixtures/consumer.py @@ -0,0 +1,30 @@ +from _operator import itemgetter + +import pytest + +from pyinfra.queue.consumer import Consumer + + +@pytest.fixture(scope="session") +def consumer(queue_manager, callback): + return Consumer(callback, queue_manager) + + +@pytest.fixture(scope="session") +def access_callback(): + return itemgetter("fileId") + + +@pytest.fixture() +def items(): + def inner(): + for i in range(3): + body = { + "dossierId": "folder", + "fileId": f"file{i}", + "targetFileExtension": "in.gz", + "responseFileExtension": "out.gz", + } + yield f"{i}".encode(), body + + return list(inner()) diff --git a/test/integration_tests/__init__.py b/test/integration_tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/test/unit_tests/consumer_test.py b/test/unit_tests/consumer_test.py index 23571a7..bff6023 100644 --- a/test/unit_tests/consumer_test.py +++ b/test/unit_tests/consumer_test.py @@ -5,37 +5,11 @@ from operator import itemgetter import pytest from pyinfra.exceptions import ProcessingFailure -from pyinfra.queue.consumer import Consumer from pyinfra.visitor import get_object_descriptor, ForwardingStrategy logger = logging.getLogger() -@pytest.fixture(scope="session") -def consumer(queue_manager, callback): - return Consumer(callback, queue_manager) - - -@pytest.fixture(scope="session") -def access_callback(): - return itemgetter("fileId") - - -@pytest.fixture() -def items(): - def inner(): - for i in range(3): - body = { - "dossierId": "folder", - "fileId": f"file{i}", - "targetFileExtension": "in.gz", - "responseFileExtension": "out.gz", - } - yield f"{i}".encode(), body - - return list(inner()) - - class TestConsumer: @pytest.mark.parametrize("queue_manager_name", ["mock", "pika"], scope="session") def test_consuming_empty_input_queue_does_not_put_anything_on_output_queue(self, consumer, queue_manager):