Marmelator/pyinfra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

fixed bug in stream_pages: return -> yield

Browse Source
This commit is contained in:
Matthias Bisping 2022-06-09 14:58:42 +02:00
parent 5b45f5fa15
commit 7e46a66698
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyinfra/queue/queue_manager/pika_queue_manager.py
View File

@ -133,7 +133,6 @@ class PikaQueueManager(QueueManager):
return self.channel.basic_get(self._input_queue) return self.channel.basic_get(self._input_queue)
def consume(self, inactivity_timeout=None, n=None): def consume(self, inactivity_timeout=None, n=None):
print(f"{n=}")
logger.debug("Consuming") logger.debug("Consuming")
gen = self.channel.consume(self._input_queue, inactivity_timeout=inactivity_timeout) gen = self.channel.consume(self._input_queue, inactivity_timeout=inactivity_timeout)
yield from islice(gen, n) yield from islice(gen, n)

2
test/fixtures/input.py vendored
View File

@ -134,7 +134,7 @@ def images_to_bytes(images):
@pytest.fixture @pytest.fixture
def metadata(n_items): 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 @pytest.fixture

2
test/fixtures/server.py vendored
View File

@ -65,7 +65,7 @@ def operation(core_operation):
result = core_operation(data, metadata) result = core_operation(data, metadata)
if isinstance(result, Generator): if isinstance(result, Generator):
for data, metadata in result: for data, metadata in result:
return data, omit(metadata, ["pages", "operation"]) yield data, omit(metadata, ["pages", "operation"])
else: else:
data, metadata = result data, metadata = result
return data, omit(metadata, ["pages", "operation"]) return data, omit(metadata, ["pages", "operation"])

4
test/integration_tests/serve_test.py
View File

@ -76,8 +76,8 @@ def test_serving(server_process, bucket_name, components, targets, data_message_
consumer.consume_and_publish(n=n_items) consumer.consume_and_publish(n=n_items)
outputs = get_data_uploaded_by_consumer(queue_manager, storage, bucket_name) outputs = get_data_uploaded_by_consumer(queue_manager, storage, bucket_name)
targets = sorted(targets, key=itemgetter(0)) # TODO: correctness of target should be validated as well, since production was become non-trivial
assert outputs == targets assert sorted(outputs) == sorted(targets)
@pytest.fixture @pytest.fixture