From f5ada54ab122d748894b4fd13b0775453bd00b32 Mon Sep 17 00:00:00 2001 From: Ali-Akber Saifee Date: Thu, 5 Dec 2024 10:34:27 -0800 Subject: [PATCH] Increase test coverage for api compatible databases --- tests/commands/test_connection.py | 4 +++- tests/commands/test_server.py | 3 +++ tests/conftest.py | 1 - tests/test_client.py | 4 ++++ tests/test_pipeline.py | 8 +++++++- tests/test_pubsub.py | 2 ++ 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tests/commands/test_connection.py b/tests/commands/test_connection.py index 25d24240..0a34d7fc 100644 --- a/tests/commands/test_connection.py +++ b/tests/commands/test_connection.py @@ -16,6 +16,8 @@ "redis_basic_raw", "redis_basic_resp2", "redis_basic_raw_resp2", + "keydb", + "valkey" "redict", ) class TestConnection: @pytest.mark.xfail @@ -34,7 +36,7 @@ async def test_ping(self, client, _s): @pytest.mark.min_server_version("6.2.0") async def test_hello_no_args(self, client, _s): resp = await client.hello() - assert resp[_s("server")] == _s("redis") + assert resp[_s("server")] is not None async def test_hello_extended(self, client, _s): resp = await client.hello(client.protocol_version) diff --git a/tests/commands/test_server.py b/tests/commands/test_server.py index db256293..c4a9175a 100644 --- a/tests/commands/test_server.py +++ b/tests/commands/test_server.py @@ -21,6 +21,9 @@ "redis_cluster", "redis_cluster_blocking", "redis_cluster_resp2", + "keydb", + "valkey", + "redict", ) class TestServer: async def slowlog(self, client, _s): diff --git a/tests/conftest.py b/tests/conftest.py index 6febbc17..58dcb5c0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1447,7 +1447,6 @@ def pytest_collection_modifyitems(items): item.add_marker(getattr(pytest.mark, token)) elif client_name.startswith("keydb"): item.add_marker(getattr(pytest.mark, "keydb")) - item.add_marker(getattr(pytest.mark, "xfail")) tokens = client_name.replace("keydb_", "").split("_") for token in tokens: diff --git a/tests/test_client.py b/tests/test_client.py index 4c53bf3d..a76f62db 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -30,6 +30,10 @@ "redis_basic_raw_resp2", "redis_ssl", "redis_ssl_resp2", + "keydb", + "dragonfly", + "valkey", + "redict", ) class TestClient: @pytest.fixture(autouse=True) diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py index d128092e..8c75d143 100644 --- a/tests/test_pipeline.py +++ b/tests/test_pipeline.py @@ -15,7 +15,13 @@ @targets( - "redis_basic", "redis_basic_blocking", "redis_basic_resp2", "keydb", "dragonfly" + "redis_basic", + "redis_basic_blocking", + "redis_basic_resp2", + "keydb", + "dragonfly", + "valkey", + "redict", ) class TestPipeline: async def test_empty_pipeline(self, client): diff --git a/tests/test_pubsub.py b/tests/test_pubsub.py index e9504123..892d262a 100644 --- a/tests/test_pubsub.py +++ b/tests/test_pubsub.py @@ -77,6 +77,8 @@ def make_subscribe_test_data(pubsub, encoder, type): "redis_basic_raw_resp2", "keydb", "dragonfly", + "valkey", + "redict", ) class TestPubSubSubscribeUnsubscribe: async def _test_subscribe_unsubscribe(