From 4fcc89f93855ea99594478feac89da4ed895c4a4 Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Tue, 14 Jun 2022 15:40:23 +0200 Subject: [PATCH] s3 backend fixture no longer needs to not come last --- test/conftest.py | 2 -- test/integration_tests/serve_test.py | 9 --------- 2 files changed, 11 deletions(-) diff --git a/test/conftest.py b/test/conftest.py index cbe1c58..9658ec6 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -92,8 +92,6 @@ def storage(client_name, bucket_name, s3_backend, docker_compose): storage.clear_bucket(bucket_name) -# NOTE: when this fixture is used, then serve_test fails. When instead a decorator with the same logic is used, -# serve_test passes. @pytest.fixture(params=["minio", "aws"]) def s3_backend(request): return request.param diff --git a/test/integration_tests/serve_test.py b/test/integration_tests/serve_test.py index 3f6eaa7..b7a0271 100644 --- a/test/integration_tests/serve_test.py +++ b/test/integration_tests/serve_test.py @@ -41,15 +41,6 @@ from test.utils.input import pair_data_with_queue_message True, ], ) -# NOTE: There is a bug in pytest, which leads this test to fail, when n_items has more than one entry and s3_backend is -# the last decorator. Yes, really. -@pytest.mark.parametrize( - "s3_backend", - [ - "minio", - "aws", - ], -) @pytest.mark.parametrize( "n_items", [