From 2f31ba69b89267373f0a4dbbed0629bf1a4cfdc2 Mon Sep 17 00:00:00 2001 From: Rishat Fayzullin Date: Sat, 15 Jun 2024 15:52:57 +0300 Subject: [PATCH] Move skipping redis/mongo tests in earlier fixtures --- tests/conftest.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index cf5e4413..56e35078 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -40,19 +40,19 @@ def pytest_configure(config): @pytest.fixture() def redis_server(request): redis_uri = request.config.getoption("--redis") - return redis_uri + if redis_uri is None: + pytest.skip(skip_message_pattern.format(db="redis")) + else: + return redis_uri @pytest.fixture() @pytest.mark.redis async def redis_storage(redis_server): - if redis_server is None: - pytest.skip(skip_message_pattern.format(db="redis")) - else: - try: - parse_redis_url(redis_server) - except ValueError as e: - raise UsageError(invalid_uri_pattern.format(db="redis", uri=redis_server, err=e)) + try: + parse_redis_url(redis_server) + except ValueError as e: + raise UsageError(invalid_uri_pattern.format(db="redis", uri=redis_server, err=e)) storage = RedisStorage.from_url(redis_server) try: await storage.redis.info() @@ -69,19 +69,19 @@ async def redis_storage(redis_server): @pytest.fixture() def mongo_server(request): mongo_uri = request.config.getoption("--mongo") - return mongo_uri + if mongo_uri is None: + pytest.skip(skip_message_pattern.format(db="mongo")) + else: + return mongo_uri @pytest.fixture() @pytest.mark.mongo async def mongo_storage(mongo_server): - if mongo_server is None: - pytest.skip(skip_message_pattern.format(db="mongo")) - else: - try: - parse_mongo_url(mongo_server) - except InvalidURI as e: - raise UsageError(invalid_uri_pattern.format(db="mongo", uri=mongo_server, err=e)) + try: + parse_mongo_url(mongo_server) + except InvalidURI as e: + raise UsageError(invalid_uri_pattern.format(db="mongo", uri=mongo_server, err=e)) storage = MongoStorage.from_url( url=mongo_server, connection_kwargs={"serverSelectionTimeoutMS": 2000},