Skip to content

Commit 33bae67

Browse files
vladvildanovvladvildanov
committed
Removed fixture, codestyle fixes
1 parent 37ed3d5 commit 33bae67

File tree

2 files changed

+24
-37
lines changed

2 files changed

+24
-37
lines changed

‎tests/test_cluster.py

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@
4646
assert_resp_response,
4747
is_resp2_connection,
4848
skip_if_redis_enterprise,
49+
skip_if_resp_version,
4950
skip_if_server_version_lt,
5051
skip_unless_arch_bits,
51-
wait_for_command, skip_if_resp_version,
52+
wait_for_command,
5253
)
5354

5455
default_host = "127.0.0.1"
@@ -284,19 +285,6 @@ def ok_response(connection, *args, **options):
284285
assert prev_primary.server_type == REPLICA
285286

286287

287-
@pytest.fixture()
288-
def r(request):
289-
protocol = 2
290-
291-
if hasattr(request, "param"):
292-
protocol = request.param.get("protocol", 2)
293-
with _get_client(
294-
redis.Redis,
295-
request,
296-
protocol=protocol,
297-
) as client:
298-
yield client
299-
300288
@pytest.mark.onlycluster
301289
class TestRedisClusterObj:
302290
"""
@@ -1876,20 +1864,21 @@ def test_cluster_rpoplpush(self, r):
18761864
assert r.lrange("{foo}a", 0, -1) == [b"a1", b"a2"]
18771865
assert r.lrange("{foo}b", 0, -1) == [b"a3", b"b1", b"b2", b"b3"]
18781866

1867+
@skip_if_resp_version(3)
18791868
def test_cluster_sdiff(self, r):
18801869
r.sadd("{foo}a", "1", "2", "3")
18811870
assert set(r.sdiff("{foo}a", "{foo}b")) == {b"1", b"2", b"3"}
18821871
r.sadd("{foo}b", "2", "3")
18831872
assert r.sdiff("{foo}a", "{foo}b") == {b"1"}
18841873

1885-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
18861874
@skip_if_resp_version(2)
18871875
def test_cluster_sdiff_resp3(self, r):
18881876
r.sadd("{foo}a", "1", "2", "3")
18891877
assert set(r.sdiff("{foo}a", "{foo}b")) == {b"1", b"2", b"3"}
18901878
r.sadd("{foo}b", "2", "3")
18911879
assert r.sdiff("{foo}a", "{foo}b") == [b"1"]
18921880

1881+
@skip_if_resp_version(3)
18931882
def test_cluster_sdiffstore(self, r):
18941883
r.sadd("{foo}a", "1", "2", "3")
18951884
assert r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 3
@@ -1898,7 +1887,6 @@ def test_cluster_sdiffstore(self, r):
18981887
assert r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 1
18991888
assert r.smembers("{foo}c") == {b"1"}
19001889

1901-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
19021890
@skip_if_resp_version(2)
19031891
def test_cluster_sdiffstore_resp3(self, r):
19041892
r.sadd("{foo}a", "1", "2", "3")
@@ -1908,20 +1896,21 @@ def test_cluster_sdiffstore_resp3(self, r):
19081896
assert r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 1
19091897
assert r.smembers("{foo}c") == [b"1"]
19101898

1899+
@skip_if_resp_version(3)
19111900
def test_cluster_sinter(self, r):
19121901
r.sadd("{foo}a", "1", "2", "3")
19131902
assert r.sinter("{foo}a", "{foo}b") == set()
19141903
r.sadd("{foo}b", "2", "3")
19151904
assert set(r.sinter("{foo}a", "{foo}b")) == {b"2", b"3"}
19161905

1917-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
19181906
@skip_if_resp_version(2)
19191907
def test_cluster_sinter_resp3(self, r):
19201908
r.sadd("{foo}a", "1", "2", "3")
19211909
assert r.sinter("{foo}a", "{foo}b") == []
19221910
r.sadd("{foo}b", "2", "3")
19231911
assert set(r.sinter("{foo}a", "{foo}b")) == {b"2", b"3"}
19241912

1913+
@skip_if_resp_version(3)
19251914
def test_cluster_sinterstore(self, r):
19261915
r.sadd("{foo}a", "1", "2", "3")
19271916
assert r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 0
@@ -1930,7 +1919,6 @@ def test_cluster_sinterstore(self, r):
19301919
assert r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 2
19311920
assert set(r.smembers("{foo}c")) == {b"2", b"3"}
19321921

1933-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
19341922
@skip_if_resp_version(2)
19351923
def test_cluster_sinterstore_resp3(self, r):
19361924
r.sadd("{foo}a", "1", "2", "3")
@@ -1940,14 +1928,14 @@ def test_cluster_sinterstore_resp3(self, r):
19401928
assert r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 2
19411929
assert set(r.smembers("{foo}c")) == {b"2", b"3"}
19421930

1931+
@skip_if_resp_version(3)
19431932
def test_cluster_smove(self, r):
19441933
r.sadd("{foo}a", "a1", "a2")
19451934
r.sadd("{foo}b", "b1", "b2")
19461935
assert r.smove("{foo}a", "{foo}b", "a1")
19471936
assert r.smembers("{foo}a") == {b"a2"}
19481937
assert set(r.smembers("{foo}b")) == {b"b1", b"b2", b"a1"}
19491938

1950-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
19511939
@skip_if_resp_version(2)
19521940
def test_cluster_smove_resp3(self, r):
19531941
r.sadd("{foo}a", "a1", "a2")

‎tests/test_commands.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,12 @@
2525
assert_resp_response_in,
2626
is_resp2_connection,
2727
skip_if_redis_enterprise,
28+
skip_if_resp_version,
2829
skip_if_server_version_gte,
2930
skip_if_server_version_lt,
30-
skip_unless_arch_bits, skip_if_resp_version,
31+
skip_unless_arch_bits,
3132
)
3233

33-
@pytest.fixture()
34-
def r(request):
35-
protocol = 2
36-
37-
if hasattr(request, "param"):
38-
protocol = request.param.get("protocol", 2)
39-
with _get_client(
40-
redis.Redis,
41-
request,
42-
protocol=protocol,
43-
) as client:
44-
yield client
4534

4635
@pytest.fixture()
4736
def slowlog(request, r):
@@ -2257,13 +2246,13 @@ def test_scard(self, r):
22572246
assert r.scard("a") == 3
22582247

22592248
@pytest.mark.onlynoncluster
2249+
@skip_if_resp_version(3)
22602250
def test_sdiff(self, r):
22612251
r.sadd("a", "1", "2", "3")
22622252
assert set(r.sdiff("a", "b")) == {b"1", b"2", b"3"}
22632253
r.sadd("b", "2", "3")
22642254
assert r.sdiff("a", "b") == {b"1"}
22652255

2266-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
22672256
@pytest.mark.onlynoncluster
22682257
@skip_if_resp_version(2)
22692258
def test_sdiff_resp3(self, r):
@@ -2273,6 +2262,7 @@ def test_sdiff_resp3(self, r):
22732262
assert r.sdiff("a", "b") == [b"1"]
22742263

22752264
@pytest.mark.onlynoncluster
2265+
@skip_if_resp_version(3)
22762266
def test_sdiffstore(self, r):
22772267
r.sadd("a", "1", "2", "3")
22782268
assert r.sdiffstore("c", "a", "b") == 3
@@ -2281,7 +2271,6 @@ def test_sdiffstore(self, r):
22812271
assert r.sdiffstore("c", "a", "b") == 1
22822272
assert r.smembers("c") == {b"1"}
22832273

2284-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
22852274
@pytest.mark.onlynoncluster
22862275
@skip_if_resp_version(2)
22872276
def test_sdiffstore_resp3(self, r):
@@ -2290,16 +2279,16 @@ def test_sdiffstore_resp3(self, r):
22902279
assert set(r.smembers("c")) == {b"1", b"2", b"3"}
22912280
r.sadd("b", "2", "3")
22922281
assert r.sdiffstore("c", "a", "b") == 1
2293-
assert r.smembers("c") == {b"1"}
2282+
assert r.smembers("c") == [b"1"]
22942283

22952284
@pytest.mark.onlynoncluster
2285+
@skip_if_resp_version(3)
22962286
def test_sinter(self, r):
22972287
r.sadd("a", "1", "2", "3")
22982288
assert r.sinter("a", "b") == set()
22992289
r.sadd("b", "2", "3")
23002290
assert set(r.sinter("a", "b")) == {b"2", b"3"}
23012291

2302-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
23032292
@pytest.mark.onlynoncluster
23042293
@skip_if_resp_version(2)
23052294
def test_sinter_resp3(self, r):
@@ -2318,6 +2307,7 @@ def test_sintercard(self, r):
23182307
assert r.sintercard(3, ["a", "b", "c"], limit=1) == 1
23192308

23202309
@pytest.mark.onlynoncluster
2310+
@skip_if_resp_version(3)
23212311
def test_sinterstore(self, r):
23222312
r.sadd("a", "1", "2", "3")
23232313
assert r.sinterstore("c", "a", "b") == 0
@@ -2326,7 +2316,6 @@ def test_sinterstore(self, r):
23262316
assert r.sinterstore("c", "a", "b") == 2
23272317
assert set(r.smembers("c")) == {b"2", b"3"}
23282318

2329-
@pytest.mark.parametrize("r", [{"protocol": 3}], indirect=True)
23302319
@pytest.mark.onlynoncluster
23312320
@skip_if_resp_version(2)
23322321
def test_sinterstore_resp3(self, r):
@@ -2356,13 +2345,23 @@ def test_smismember(self, r):
23562345
assert r.smismember("a", ["1", "4", "2", "3"]) == result_list
23572346

23582347
@pytest.mark.onlynoncluster
2348+
@skip_if_resp_version(3)
23592349
def test_smove(self, r):
23602350
r.sadd("a", "a1", "a2")
23612351
r.sadd("b", "b1", "b2")
23622352
assert r.smove("a", "b", "a1")
23632353
assert r.smembers("a") == {b"a2"}
23642354
assert set(r.smembers("b")) == {b"b1", b"b2", b"a1"}
23652355

2356+
@pytest.mark.onlynoncluster
2357+
@skip_if_resp_version(2)
2358+
def test_smove_resp3(self, r):
2359+
r.sadd("a", "a1", "a2")
2360+
r.sadd("b", "b1", "b2")
2361+
assert r.smove("a", "b", "a1")
2362+
assert r.smembers("a") == [b"a2"]
2363+
assert set(r.smembers("b")) == {b"b1", b"b2", b"a1"}
2364+
23662365
def test_spop(self, r):
23672366
s = [b"1", b"2", b"3"]
23682367
r.sadd("a", *s)

0 commit comments

Comments
 (0)