Skip to content

Commit dad9f21

Browse files
committed
fix redis tests
1 parent 1169146 commit dad9f21

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ valkey = ["valkey"]
7676
dev = [
7777
# tests
7878
"bump-my-version",
79-
"pytest-databases[azure-storage,bigquery,cockroachdb,dragonfly,elasticsearch7,elasticsearch8,keydb,mssql,mysql,mariadb,oracle,postgres,redis,spanner,minio,valkey]",
79+
"pytest-databases[azure-storage,bigquery,cockroachdb,dragonfly,elasticsearch7,elasticsearch8,keydb,mssql,mysql,oracle,postgres,redis,spanner,minio,valkey]",
8080
"coverage[toml]>=6.2",
8181
"pytest",
8282
"pytest-cov",

tests/test_redis.py

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def redis_image():
4646
return "{redis_image_name}"
4747
4848
def test_redis_service(redis_service: RedisService) -> None:
49-
assert redis.Redis.from_url("redis://", host=redis_service.host, port=redis_service.port).ping()
49+
assert redis.Redis(host=redis_service.host, port=redis_service.port).ping()
5050
""")
5151
result = pytester.runpytest()
5252
result.assert_outcomes(passed=1)
@@ -64,7 +64,7 @@ def test_default_no_xdist(pytester: pytest.Pytester, redis_compatible_service: s
6464
]
6565
6666
def test_redis_service({redis_compatible_service}: RedisService) -> None:
67-
assert redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port).ping()
67+
assert redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port).ping()
6868
""")
6969
result = pytester.runpytest()
7070
result.assert_outcomes(passed=1)
@@ -82,27 +82,31 @@ def test_xdist_isolate_database(pytester: pytest.Pytester, redis_compatible_serv
8282
]
8383
8484
def test_one({redis_compatible_service}: RedisService) -> None:
85-
client = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
86-
assert not client.get("one")
87-
client.set("one", "1")
85+
client = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
8886
assert {redis_compatible_service}.db == get_xdist_worker_num()
87+
assert not client.get("one")
88+
client.set("one", "0")
89+
assert client.get("one") == b"0"
8990
9091
9192
def test_two({redis_compatible_service}: RedisService) -> None:
92-
client = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
93+
client = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
94+
assert {redis_compatible_service}.db == get_xdist_worker_num()
9395
assert not client.get("one")
9496
client.set("one", "1")
95-
assert {redis_compatible_service}.db == get_xdist_worker_num()
97+
assert client.get("one") == b"1"
9698
9799
98100
def test_use_same_db({redis_compatible_service}: RedisService) -> None:
99-
client_0 = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db=0)
100-
client_1 = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db=1)
101-
assert client_0.get("one") == "1"
102-
assert client_1.get("one") == "1"
101+
client_0 = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db=0)
102+
client_1 = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db=1)
103+
client_0.set("foo", "0")
104+
client_1.set("foo", "1")
105+
assert client_0.get("foo") == b"0"
106+
assert client_1.get("foo") == b"1"
103107
""")
104108
result = pytester.runpytest("-n", "2")
105-
result.assert_outcomes(passed=2)
109+
result.assert_outcomes(passed=3)
106110

107111

108112
def test_xdist_isolate_server(pytester: pytest.Pytester, redis_compatible_service: str) -> None:
@@ -122,14 +126,14 @@ def xdist_redis_isolation_level():
122126
123127
124128
def test_one({redis_compatible_service}: RedisService) -> None:
125-
client = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
129+
client = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
126130
assert not client.get("one")
127131
client.set("one", "1")
128132
assert {redis_compatible_service}.db == 0
129133
130134
131135
def test_two({redis_compatible_service}: RedisService) -> None:
132-
client = redis.Redis.from_url("redis://", host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
136+
client = redis.Redis(host={redis_compatible_service}.host, port={redis_compatible_service}.port, db={redis_compatible_service}.db)
133137
assert not client.get("one")
134138
client.set("one", "1")
135139
assert {redis_compatible_service}.db == 0

uv.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)