From a688cbd7bd3b1153e861a5b0a9f00e637588590b Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Tue, 31 May 2022 13:57:20 +0200 Subject: [PATCH] refactoring --- pyinfra/default_objects.py | 9 ++++----- test/integration_tests/serve_test.py | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pyinfra/default_objects.py b/pyinfra/default_objects.py index caa87e1..1b1e043 100644 --- a/pyinfra/default_objects.py +++ b/pyinfra/default_objects.py @@ -38,9 +38,9 @@ def get_storage(): @lru_cache(maxsize=None) -def get_callback(analysis_endpoint=None): - analysis_endpoint = analysis_endpoint or CONFIG.rabbitmq.callback.analysis_endpoint - return make_callback(analysis_endpoint) +def get_callback(analysis_base_url=None): + analysis_base_url = analysis_base_url or CONFIG.rabbitmq.callback.analysis_endpoint + return make_callback(analysis_base_url) @lru_cache(maxsize=None) @@ -49,8 +49,7 @@ def get_response_strategy(storage=None): @lru_cache(maxsize=None) -def make_callback(endpoint): - url = "/".join(endpoint.split("/")[:-1]) +def make_callback(url): return Callback(url) diff --git a/test/integration_tests/serve_test.py b/test/integration_tests/serve_test.py index b10f1da..ae53d23 100644 --- a/test/integration_tests/serve_test.py +++ b/test/integration_tests/serve_test.py @@ -26,9 +26,9 @@ def freeze(data, metadata): @pytest.fixture -def components(endpoint, bucket_name, queue_manager, storage): +def components(url, bucket_name, queue_manager, storage): - callback = get_callback(endpoint) + callback = get_callback(url) consumer = Consumer(callback, queue_manager) visitor = QueueVisitor(storage, callback, get_response_strategy(storage)) @@ -58,7 +58,7 @@ def decode(storage_item): True, ], ) -@pytest.mark.parametrize("n_items", [1, 2]) +@pytest.mark.parametrize("n_items", [1, 3]) @pytest.mark.parametrize("n_pages", [1]) @pytest.mark.parametrize("buffer_size", [2]) @pytest.mark.parametrize(