refactoring

This commit is contained in:
Matthias Bisping 2022-05-31 13:57:20 +02:00
parent 0104395790
commit a688cbd7bd
2 changed files with 7 additions and 8 deletions

View File

@ -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)

View File

@ -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(