Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci fix: fix data types changes in redis 7 #470

Merged
merged 10 commits into from
Sep 15, 2023
Merged

ci fix: fix data types changes in redis 7 #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ced5d65
bugfix: decode escape for restore command
laixintao Sep 15, 2023
a5dc568
bugfix escape for all args
laixintao Sep 15, 2023
836e7bc
bugfix: only escape decode for restore command
laixintao Sep 15, 2023
3302c8c
add a todo
laixintao Sep 15, 2023
9ae700b
fix regex
laixintao Sep 15, 2023
bae4036
fix peek assert
laixintao Sep 15, 2023
be57376
add command restore test
laixintao Sep 15, 2023
190a3b5
ci fix: fix data types changes in redis 7
laixintao Sep 15, 2023
1de9b10
bugfix list type
laixintao Sep 15, 2023
59ce1ca
black
laixintao Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion tests/cli_tests/test_pager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,18 @@ def test_using_pager_works_for_help():
child.expect(TEST_PAGER_BOUNDARY)


long_list_type = "quicklist"
if os.environ["REDIS_VERSION"] == "7":
long_list_type = "listpack"


def test_pager_works_for_peek(clean_redis):
for index in range(100):
clean_redis.lpush("long-list", f"value-{index}")
with pager_enabled_cli() as child:
child.sendline("peek long-list")
child.expect(TEST_PAGER_BOUNDARY)
child.expect("(quicklist)")
child.expect(f"({long_list_type})")
child.expect("value-1")
child.expect(TEST_PAGER_BOUNDARY)

Expand Down
8 changes: 6 additions & 2 deletions tests/unittests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ def completer():


zset_type = "ziplist"
hash_type = "hashtable"
list_type = "quicklist"
if os.environ["REDIS_VERSION"] == "7":
zset_type = "listpack"
hash_type = "listpack"
list_type = "listpack"


@pytest.mark.parametrize(
Expand Down Expand Up @@ -303,7 +307,7 @@ def test_peek_list_fetch_all(iredis_client, clean_redis):
FormattedText(
[
("class:dockey", "key: "),
("", r"list \(quicklist\) mem: \d+ bytes, ttl: -1"),
("", rf"list \({list_type}\) mem: \d+ bytes, ttl: -1"),
("", "\n"),
("class:dockey", "llen: "),
("", "5"),
Expand Down Expand Up @@ -351,7 +355,7 @@ def test_peek_set_fetch_part(iredis_client, clean_redis):
peek_result = list(iredis_client.do_peek("myset"))

assert peek_result[0][0] == ("class:dockey", "key: ")
assert peek_result[0][1][1].startswith("set (hashtable) mem: ")
assert peek_result[0][1][1].startswith(f"set ({hash_type}) mem: ")


def test_peek_zset_fetch_all(iredis_client, clean_redis):
Expand Down
Loading