Skip to content

Commit ca85e6e

Browse files
committed
Fixed asyncio cluster test cases
1 parent 5142d1f commit ca85e6e

File tree

1 file changed

+47
-1
lines changed

1 file changed

+47
-1
lines changed

tests/test_asyncio/test_cluster.py

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
assert_resp_response,
3434
is_resp2_connection,
3535
skip_if_redis_enterprise,
36+
skip_if_resp_version,
3637
skip_if_server_version_gte,
3738
skip_if_server_version_lt,
3839
skip_unless_arch_bits,
@@ -1750,12 +1751,21 @@ async def test_cluster_rpoplpush(self, r: RedisCluster) -> None:
17501751
assert await r.lrange("{foo}a", 0, -1) == [b"a1", b"a2"]
17511752
assert await r.lrange("{foo}b", 0, -1) == [b"a3", b"b1", b"b2", b"b3"]
17521753

1754+
@skip_if_resp_version(3)
17531755
async def test_cluster_sdiff(self, r: RedisCluster) -> None:
17541756
await r.sadd("{foo}a", "1", "2", "3")
1755-
assert set(await r.sdiff("{foo}a", "{foo}b")) == {b"1", b"2", b"3"}
1757+
assert await r.sdiff("{foo}a", "{foo}b") == {b"1", b"2", b"3"}
17561758
await r.sadd("{foo}b", "2", "3")
17571759
assert await r.sdiff("{foo}a", "{foo}b") == {b"1"}
17581760

1761+
@skip_if_resp_version(2)
1762+
async def test_cluster_sdiff_resp3(self, r: RedisCluster) -> None:
1763+
await r.sadd("{foo}a", "1", "2", "3")
1764+
assert await r.sdiff("{foo}a", "{foo}b") == [b"1", b"2", b"3"]
1765+
await r.sadd("{foo}b", "2", "3")
1766+
assert await r.sdiff("{foo}a", "{foo}b") == [b"1"]
1767+
1768+
@skip_if_resp_version(3)
17591769
async def test_cluster_sdiffstore(self, r: RedisCluster) -> None:
17601770
await r.sadd("{foo}a", "1", "2", "3")
17611771
assert await r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 3
@@ -1764,12 +1774,30 @@ async def test_cluster_sdiffstore(self, r: RedisCluster) -> None:
17641774
assert await r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 1
17651775
assert await r.smembers("{foo}c") == {b"1"}
17661776

1777+
@skip_if_resp_version(2)
1778+
async def test_cluster_sdiffstore_resp3(self, r: RedisCluster) -> None:
1779+
await r.sadd("{foo}a", "1", "2", "3")
1780+
assert await r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 3
1781+
assert await r.smembers("{foo}c") == [b"1", b"2", b"3"]
1782+
await r.sadd("{foo}b", "2", "3")
1783+
assert await r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 1
1784+
assert await r.smembers("{foo}c") == [b"1"]
1785+
1786+
@skip_if_resp_version(3)
17671787
async def test_cluster_sinter(self, r: RedisCluster) -> None:
17681788
await r.sadd("{foo}a", "1", "2", "3")
17691789
assert await r.sinter("{foo}a", "{foo}b") == set()
17701790
await r.sadd("{foo}b", "2", "3")
17711791
assert set(await r.sinter("{foo}a", "{foo}b")) == {b"2", b"3"}
17721792

1793+
@skip_if_resp_version(2)
1794+
async def test_cluster_sinter_resp3(self, r: RedisCluster) -> None:
1795+
await r.sadd("{foo}a", "1", "2", "3")
1796+
assert await r.sinter("{foo}a", "{foo}b") == []
1797+
await r.sadd("{foo}b", "2", "3")
1798+
assert await r.sinter("{foo}a", "{foo}b") == [b"2", b"3"]
1799+
1800+
@skip_if_resp_version(3)
17731801
async def test_cluster_sinterstore(self, r: RedisCluster) -> None:
17741802
await r.sadd("{foo}a", "1", "2", "3")
17751803
assert await r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 0
@@ -1778,13 +1806,31 @@ async def test_cluster_sinterstore(self, r: RedisCluster) -> None:
17781806
assert await r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 2
17791807
assert set(await r.smembers("{foo}c")) == {b"2", b"3"}
17801808

1809+
@skip_if_resp_version(2)
1810+
async def test_cluster_sinterstore_resp3(self, r: RedisCluster) -> None:
1811+
await r.sadd("{foo}a", "1", "2", "3")
1812+
assert await r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 0
1813+
assert await r.smembers("{foo}c") == []
1814+
await r.sadd("{foo}b", "2", "3")
1815+
assert await r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 2
1816+
assert await r.smembers("{foo}c") == [b"2", b"3"]
1817+
1818+
@skip_if_resp_version(3)
17811819
async def test_cluster_smove(self, r: RedisCluster) -> None:
17821820
await r.sadd("{foo}a", "a1", "a2")
17831821
await r.sadd("{foo}b", "b1", "b2")
17841822
assert await r.smove("{foo}a", "{foo}b", "a1")
17851823
assert await r.smembers("{foo}a") == {b"a2"}
17861824
assert set(await r.smembers("{foo}b")) == {b"b1", b"b2", b"a1"}
17871825

1826+
@skip_if_resp_version(2)
1827+
async def test_cluster_smove_resp3(self, r: RedisCluster) -> None:
1828+
await r.sadd("{foo}a", "a1", "a2")
1829+
await r.sadd("{foo}b", "b1", "b2")
1830+
assert await r.smove("{foo}a", "{foo}b", "a1")
1831+
assert await r.smembers("{foo}a") == [b"a2"]
1832+
assert await r.smembers("{foo}b") == [b"b1", b"b2", b"a1"]
1833+
17881834
async def test_cluster_sunion(self, r: RedisCluster) -> None:
17891835
await r.sadd("{foo}a", "1", "2")
17901836
await r.sadd("{foo}b", "2", "3")

0 commit comments

Comments
 (0)