Skip to content

Commit f5e56db

Browse files
author
Gabriel Erzse
committed
Fix failing tests
1 parent 89d75ca commit f5e56db

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎tests/test_asyncio/test_cluster.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,49 +1753,49 @@ async def test_cluster_rpoplpush(self, r: RedisCluster) -> None:
17531753

17541754
async def test_cluster_sdiff(self, r: RedisCluster) -> None:
17551755
await r.sadd("{foo}a", "1", "2", "3")
1756-
assert await r.sdiff("{foo}a", "{foo}b") == {b"1", b"2", b"3"}
1756+
assert set(await r.sdiff("{foo}a", "{foo}b")) == {b"1", b"2", b"3"}
17571757
await r.sadd("{foo}b", "2", "3")
1758-
assert await r.sdiff("{foo}a", "{foo}b") == {b"1"}
1758+
assert await r.sdiff("{foo}a", "{foo}b") == [b"1"]
17591759

17601760
async def test_cluster_sdiffstore(self, r: RedisCluster) -> None:
17611761
await r.sadd("{foo}a", "1", "2", "3")
17621762
assert await r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 3
1763-
assert await r.smembers("{foo}c") == {b"1", b"2", b"3"}
1763+
assert set(await r.smembers("{foo}c")) == {b"1", b"2", b"3"}
17641764
await r.sadd("{foo}b", "2", "3")
17651765
assert await r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 1
1766-
assert await r.smembers("{foo}c") == {b"1"}
1766+
assert await r.smembers("{foo}c") == [b"1"]
17671767

17681768
async def test_cluster_sinter(self, r: RedisCluster) -> None:
17691769
await r.sadd("{foo}a", "1", "2", "3")
1770-
assert await r.sinter("{foo}a", "{foo}b") == set()
1770+
assert await r.sinter("{foo}a", "{foo}b") == []
17711771
await r.sadd("{foo}b", "2", "3")
1772-
assert await r.sinter("{foo}a", "{foo}b") == {b"2", b"3"}
1772+
assert set(await r.sinter("{foo}a", "{foo}b")) == {b"2", b"3"}
17731773

17741774
async def test_cluster_sinterstore(self, r: RedisCluster) -> None:
17751775
await r.sadd("{foo}a", "1", "2", "3")
17761776
assert await r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 0
1777-
assert await r.smembers("{foo}c") == set()
1777+
assert await r.smembers("{foo}c") == []
17781778
await r.sadd("{foo}b", "2", "3")
17791779
assert await r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 2
1780-
assert await r.smembers("{foo}c") == {b"2", b"3"}
1780+
assert set(await r.smembers("{foo}c")) == {b"2", b"3"}
17811781

17821782
async def test_cluster_smove(self, r: RedisCluster) -> None:
17831783
await r.sadd("{foo}a", "a1", "a2")
17841784
await r.sadd("{foo}b", "b1", "b2")
17851785
assert await r.smove("{foo}a", "{foo}b", "a1")
1786-
assert await r.smembers("{foo}a") == {b"a2"}
1787-
assert await r.smembers("{foo}b") == {b"b1", b"b2", b"a1"}
1786+
assert await r.smembers("{foo}a") == [b"a2"]
1787+
assert set(await r.smembers("{foo}b")) == {b"b1", b"b2", b"a1"}
17881788

17891789
async def test_cluster_sunion(self, r: RedisCluster) -> None:
17901790
await r.sadd("{foo}a", "1", "2")
17911791
await r.sadd("{foo}b", "2", "3")
1792-
assert await r.sunion("{foo}a", "{foo}b") == {b"1", b"2", b"3"}
1792+
assert set(await r.sunion("{foo}a", "{foo}b")) == {b"1", b"2", b"3"}
17931793

17941794
async def test_cluster_sunionstore(self, r: RedisCluster) -> None:
17951795
await r.sadd("{foo}a", "1", "2")
17961796
await r.sadd("{foo}b", "2", "3")
17971797
assert await r.sunionstore("{foo}c", "{foo}a", "{foo}b") == 3
1798-
assert await r.smembers("{foo}c") == {b"1", b"2", b"3"}
1798+
assert set(await r.smembers("{foo}c")) == {b"1", b"2", b"3"}
17991799

18001800
@skip_if_server_version_lt("6.2.0")
18011801
async def test_cluster_zdiff(self, r: RedisCluster) -> None:

‎tests/test_cluster.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,49 +1868,49 @@ def test_cluster_rpoplpush(self, r):
18681868

18691869
def test_cluster_sdiff(self, r):
18701870
r.sadd("{foo}a", "1", "2", "3")
1871-
assert r.sdiff("{foo}a", "{foo}b") == {b"1", b"2", b"3"}
1871+
assert set(r.sdiff("{foo}a", "{foo}b")) == {b"1", b"2", b"3"}
18721872
r.sadd("{foo}b", "2", "3")
1873-
assert r.sdiff("{foo}a", "{foo}b") == {b"1"}
1873+
assert r.sdiff("{foo}a", "{foo}b") == [b"1"]
18741874

18751875
def test_cluster_sdiffstore(self, r):
18761876
r.sadd("{foo}a", "1", "2", "3")
18771877
assert r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 3
1878-
assert r.smembers("{foo}c") == {b"1", b"2", b"3"}
1878+
assert set(r.smembers("{foo}c")) == {b"1", b"2", b"3"}
18791879
r.sadd("{foo}b", "2", "3")
18801880
assert r.sdiffstore("{foo}c", "{foo}a", "{foo}b") == 1
1881-
assert r.smembers("{foo}c") == {b"1"}
1881+
assert r.smembers("{foo}c") == [b"1"]
18821882

18831883
def test_cluster_sinter(self, r):
18841884
r.sadd("{foo}a", "1", "2", "3")
1885-
assert r.sinter("{foo}a", "{foo}b") == set()
1885+
assert r.sinter("{foo}a", "{foo}b") == []
18861886
r.sadd("{foo}b", "2", "3")
1887-
assert r.sinter("{foo}a", "{foo}b") == {b"2", b"3"}
1887+
assert set(r.sinter("{foo}a", "{foo}b")) == {b"2", b"3"}
18881888

18891889
def test_cluster_sinterstore(self, r):
18901890
r.sadd("{foo}a", "1", "2", "3")
18911891
assert r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 0
1892-
assert r.smembers("{foo}c") == set()
1892+
assert r.smembers("{foo}c") == []
18931893
r.sadd("{foo}b", "2", "3")
18941894
assert r.sinterstore("{foo}c", "{foo}a", "{foo}b") == 2
1895-
assert r.smembers("{foo}c") == {b"2", b"3"}
1895+
assert set(r.smembers("{foo}c")) == {b"2", b"3"}
18961896

18971897
def test_cluster_smove(self, r):
18981898
r.sadd("{foo}a", "a1", "a2")
18991899
r.sadd("{foo}b", "b1", "b2")
19001900
assert r.smove("{foo}a", "{foo}b", "a1")
1901-
assert r.smembers("{foo}a") == {b"a2"}
1902-
assert r.smembers("{foo}b") == {b"b1", b"b2", b"a1"}
1901+
assert r.smembers("{foo}a") == [b"a2"]
1902+
assert set(r.smembers("{foo}b")) == {b"b1", b"b2", b"a1"}
19031903

19041904
def test_cluster_sunion(self, r):
19051905
r.sadd("{foo}a", "1", "2")
19061906
r.sadd("{foo}b", "2", "3")
1907-
assert r.sunion("{foo}a", "{foo}b") == {b"1", b"2", b"3"}
1907+
assert set(r.sunion("{foo}a", "{foo}b")) == {b"1", b"2", b"3"}
19081908

19091909
def test_cluster_sunionstore(self, r):
19101910
r.sadd("{foo}a", "1", "2")
19111911
r.sadd("{foo}b", "2", "3")
19121912
assert r.sunionstore("{foo}c", "{foo}a", "{foo}b") == 3
1913-
assert r.smembers("{foo}c") == {b"1", b"2", b"3"}
1913+
assert set(r.smembers("{foo}c")) == {b"1", b"2", b"3"}
19141914

19151915
@skip_if_server_version_lt("6.2.0")
19161916
def test_cluster_zdiff(self, r):

‎tests/test_timeseries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ def test_query_index(client):
988988
client.ts().create(2, labels={"Test": "This", "Taste": "That"})
989989
assert 2 == len(client.ts().queryindex(["Test=This"]))
990990
assert 1 == len(client.ts().queryindex(["Taste=That"]))
991-
assert ["2"] == client.ts().queryindex(["Taste=That"])
991+
assert_resp_response(client, client.ts().queryindex(["Taste=That"]), [2], ["2"])
992992

993993

994994
@pytest.mark.redismod

0 commit comments

Comments
 (0)