From 7e46a6669867a7983990abfcb2d431ed05a5ee30 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Thu, 9 Jun 2022 14:58:42 +0200 Subject: [PATCH] fixed bug in stream_pages: return -> yield --- pyinfra/queue/queue_manager/pika_queue_manager.py | 1 - test/fixtures/input.py | 2 +- test/fixtures/server.py | 2 +- test/integration_tests/serve_test.py | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pyinfra/queue/queue_manager/pika_queue_manager.py b/pyinfra/queue/queue_manager/pika_queue_manager.py index 01f7286..20eb993 100644 --- a/pyinfra/queue/queue_manager/pika_queue_manager.py +++ b/pyinfra/queue/queue_manager/pika_queue_manager.py @@ -133,7 +133,6 @@ class PikaQueueManager(QueueManager): return self.channel.basic_get(self._input_queue) def consume(self, inactivity_timeout=None, n=None): - print(f"{n=}") logger.debug("Consuming") gen = self.channel.consume(self._input_queue, inactivity_timeout=inactivity_timeout) yield from islice(gen, n) diff --git a/test/fixtures/input.py b/test/fixtures/input.py index d68e1a6..b27b43f 100644 --- a/test/fixtures/input.py +++ b/test/fixtures/input.py @@ -134,7 +134,7 @@ def images_to_bytes(images): @pytest.fixture def metadata(n_items): - return list(repeat({"key": "value", "pages": [0, 2, 3]}, n_items)) + return repeat({"key": "value", "pages": [0, 2, 3]}) @pytest.fixture diff --git a/test/fixtures/server.py b/test/fixtures/server.py index 5ef3b04..70395a3 100644 --- a/test/fixtures/server.py +++ b/test/fixtures/server.py @@ -65,7 +65,7 @@ def operation(core_operation): result = core_operation(data, metadata) if isinstance(result, Generator): for data, metadata in result: - return data, omit(metadata, ["pages", "operation"]) + yield data, omit(metadata, ["pages", "operation"]) else: data, metadata = result return data, omit(metadata, ["pages", "operation"]) diff --git a/test/integration_tests/serve_test.py b/test/integration_tests/serve_test.py index 458b23a..bfbd4a6 100644 --- a/test/integration_tests/serve_test.py +++ b/test/integration_tests/serve_test.py @@ -76,8 +76,8 @@ def test_serving(server_process, bucket_name, components, targets, data_message_ consumer.consume_and_publish(n=n_items) outputs = get_data_uploaded_by_consumer(queue_manager, storage, bucket_name) - targets = sorted(targets, key=itemgetter(0)) - assert outputs == targets + # TODO: correctness of target should be validated as well, since production was become non-trivial + assert sorted(outputs) == sorted(targets) @pytest.fixture