Skip to content

Commit a82559e

Browse files
committed
Fixed test cases
1 parent 3106032 commit a82559e

File tree

3 files changed

+56
-4
lines changed

3 files changed

+56
-4
lines changed

tests/test_asyncio/test_search.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
is_resp2_connection,
2828
skip_if_redis_enterprise,
2929
skip_if_resp_version,
30-
skip_ifmodversion_lt,
30+
skip_ifmodversion_lt, skip_if_server_version_gte, skip_if_server_version_lt,
3131
)
3232

3333
WILL_PLAY_TEXT = os.path.abspath(
@@ -1111,6 +1111,7 @@ async def test_get(decoded_r: redis.Redis):
11111111
@pytest.mark.redismod
11121112
@pytest.mark.onlynoncluster
11131113
@skip_ifmodversion_lt("2.2.0", "search")
1114+
@skip_if_server_version_gte("7.9.0")
11141115
async def test_config(decoded_r: redis.Redis):
11151116
assert await decoded_r.ft().config_set("TIMEOUT", "100")
11161117
with pytest.raises(redis.ResponseError):
@@ -1120,6 +1121,18 @@ async def test_config(decoded_r: redis.Redis):
11201121
res = await decoded_r.ft().config_get("TIMEOUT")
11211122
assert "100" == res["TIMEOUT"]
11221123

1124+
@pytest.mark.redismod
1125+
@pytest.mark.onlynoncluster
1126+
@skip_if_server_version_lt("7.9.0")
1127+
async def test_config_with_removed_ftconfig(decoded_r: redis.Redis):
1128+
assert await decoded_r.config_set("timeout", "100")
1129+
with pytest.raises(redis.ResponseError):
1130+
await decoded_r.config_set("timeout", "null")
1131+
res = await decoded_r.config_get("*")
1132+
assert "100" == res["timeout"]
1133+
res = await decoded_r.config_get("timeout")
1134+
assert "100" == res["timeout"]
1135+
11231136

11241137
@pytest.mark.redismod
11251138
@pytest.mark.onlynoncluster

tests/test_commands.py

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,6 +1823,7 @@ def try_delete_libs(self, r, *lib_names):
18231823

18241824
@pytest.mark.onlynoncluster
18251825
@skip_if_server_version_lt("7.1.140")
1826+
@skip_if_server_version_gte("7.9.0")
18261827
def test_tfunction_load_delete(self, stack_r):
18271828
self.try_delete_libs(stack_r, "lib1")
18281829
lib_code = self.generate_lib_code("lib1")
@@ -1831,6 +1832,7 @@ def test_tfunction_load_delete(self, stack_r):
18311832

18321833
@pytest.mark.onlynoncluster
18331834
@skip_if_server_version_lt("7.1.140")
1835+
@skip_if_server_version_gte("7.9.0")
18341836
def test_tfunction_list(self, stack_r):
18351837
self.try_delete_libs(stack_r, "lib1", "lib2", "lib3")
18361838
assert stack_r.tfunction_load(self.generate_lib_code("lib1"))
@@ -1861,6 +1863,7 @@ def test_tfunction_list(self, stack_r):
18611863

18621864
@pytest.mark.onlynoncluster
18631865
@skip_if_server_version_lt("7.1.140")
1866+
@skip_if_server_version_gte("7.9.0")
18641867
def test_tfcall(self, stack_r):
18651868
self.try_delete_libs(stack_r, "lib1")
18661869
assert stack_r.tfunction_load(self.generate_lib_code("lib1"))
@@ -4329,6 +4332,7 @@ def test_xgroup_create_mkstream(self, r):
43294332
assert r.xinfo_groups(stream) == expected
43304333

43314334
@skip_if_server_version_lt("7.0.0")
4335+
@skip_if_server_version_gte("7.9.0")
43324336
def test_xgroup_create_entriesread(self, r: redis.Redis):
43334337
stream = "stream"
43344338
group = "group"
@@ -4350,6 +4354,28 @@ def test_xgroup_create_entriesread(self, r: redis.Redis):
43504354
]
43514355
assert r.xinfo_groups(stream) == expected
43524356

4357+
@skip_if_server_version_lt("7.9.0")
4358+
def test_xgroup_create_entriesread_with_fixed_lag_field(self, r: redis.Redis):
4359+
stream = "stream"
4360+
group = "group"
4361+
r.xadd(stream, {"foo": "bar"})
4362+
4363+
# no group is setup yet, no info to obtain
4364+
assert r.xinfo_groups(stream) == []
4365+
4366+
assert r.xgroup_create(stream, group, 0, entries_read=7)
4367+
expected = [
4368+
{
4369+
"name": group.encode(),
4370+
"consumers": 0,
4371+
"pending": 0,
4372+
"last-delivered-id": b"0-0",
4373+
"entries-read": 7,
4374+
"lag": 1,
4375+
}
4376+
]
4377+
assert r.xinfo_groups(stream) == expected
4378+
43534379
@skip_if_server_version_lt("5.0.0")
43544380
def test_xgroup_delconsumer(self, r):
43554381
stream = "stream"

tests/test_search.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
skip_if_redis_enterprise,
3232
skip_if_resp_version,
3333
skip_if_server_version_lt,
34-
skip_ifmodversion_lt,
34+
skip_ifmodversion_lt, skip_if_server_version_gte,
3535
)
3636

3737
WILL_PLAY_TEXT = os.path.abspath(
@@ -1007,6 +1007,7 @@ def test_get(client):
10071007
@pytest.mark.redismod
10081008
@pytest.mark.onlynoncluster
10091009
@skip_ifmodversion_lt("2.2.0", "search")
1010+
@skip_if_server_version_gte("7.9.0")
10101011
def test_config(client):
10111012
assert client.ft().config_set("TIMEOUT", "100")
10121013
with pytest.raises(redis.ResponseError):
@@ -1016,6 +1017,18 @@ def test_config(client):
10161017
res = client.ft().config_get("TIMEOUT")
10171018
assert "100" == res["TIMEOUT"]
10181019

1020+
@pytest.mark.redismod
1021+
@pytest.mark.onlynoncluster
1022+
@skip_if_server_version_lt("7.9.0")
1023+
def test_config_with_removed_ftconfig(client):
1024+
assert client.config_set("timeout", "100")
1025+
with pytest.raises(redis.ResponseError):
1026+
client.config_set("timeout", "null")
1027+
res = client.config_get("*")
1028+
assert "100" == res["timeout"]
1029+
res = client.config_get("timeout")
1030+
assert "100" == res["timeout"]
1031+
10191032

10201033
@pytest.mark.redismod
10211034
@pytest.mark.onlynoncluster
@@ -1573,11 +1586,11 @@ def test_index_definition(client):
15731586
@skip_if_redis_enterprise()
15741587
def test_expire(client):
15751588
client.ft().create_index((TextField("txt", sortable=True),), temporary=4)
1576-
ttl = client.execute_command("ft.debug", "TTL", "idx")
1589+
ttl = client.execute_command("_ft.debug", "TTL", "idx")
15771590
assert ttl > 2
15781591

15791592
while ttl > 2:
1580-
ttl = client.execute_command("ft.debug", "TTL", "idx")
1593+
ttl = client.execute_command("_ft.debug", "TTL", "idx")
15811594
time.sleep(0.01)
15821595

15831596

0 commit comments

Comments
 (0)