From ec80aa0259c0c014bbbe496bd19a570be6fc6fae Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 20 Sep 2023 11:20:47 +0200 Subject: Adding upstream version 1.13.2. Signed-off-by: Daniel Baumann --- tests/cli_tests/test_command_restore.py | 6 ++++++ tests/cli_tests/test_pager.py | 7 ++++++- tests/unittests/test_client.py | 10 +++++++--- tests/unittests/test_entry.py | 1 - tests/unittests/test_markdown_doc_render.py | 2 +- 5 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 tests/cli_tests/test_command_restore.py (limited to 'tests') diff --git a/tests/cli_tests/test_command_restore.py b/tests/cli_tests/test_command_restore.py new file mode 100644 index 0000000..1c34405 --- /dev/null +++ b/tests/cli_tests/test_command_restore.py @@ -0,0 +1,6 @@ +def test_restore_command(clean_redis, cli): + cli.sendline(r'restore foo1 0 "\x00\x03bar\t\x006L\x18\xac\xba\xe0\x9e\xa6"') + cli.expect(["OK", "127.0.0.1"]) + + cli.sendline("get foo1") + cli.expect('"bar"') diff --git a/tests/cli_tests/test_pager.py b/tests/cli_tests/test_pager.py index 38ced31..5a285a8 100644 --- a/tests/cli_tests/test_pager.py +++ b/tests/cli_tests/test_pager.py @@ -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) diff --git a/tests/unittests/test_client.py b/tests/unittests/test_client.py index 45f0054..77a48de 100644 --- a/tests/unittests/test_client.py +++ b/tests/unittests/test_client.py @@ -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( @@ -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"), @@ -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: 2") + assert peek_result[0][1][1].startswith(f"set ({hash_type}) mem: ") def test_peek_zset_fetch_all(iredis_client, clean_redis): @@ -425,7 +429,7 @@ def test_peek_stream(iredis_client, clean_redis): assert peek_result[0][0] == ("class:dockey", "key: ") assert re.match( - r"stream \((stream|unknown)\) mem: 6\d\d bytes, ttl: -1", peek_result[0][1][1] + r"stream \((stream|unknown)\) mem: \d+ bytes, ttl: -1", peek_result[0][1][1] ) assert peek_result[0][2:18] == FormattedText( [ diff --git a/tests/unittests/test_entry.py b/tests/unittests/test_entry.py index 912aabf..e53861e 100644 --- a/tests/unittests/test_entry.py +++ b/tests/unittests/test_entry.py @@ -28,7 +28,6 @@ from iredis.utils import DSN def test_command_entry_tty(is_tty, raw_arg_is_raw, final_config_is_raw, config): # is tty + raw -> raw with patch("sys.stdout.isatty") as patch_tty: - patch_tty.return_value = is_tty if raw_arg_is_raw is None: call = ["iredis"] diff --git a/tests/unittests/test_markdown_doc_render.py b/tests/unittests/test_markdown_doc_render.py index 0538299..0c66260 100644 --- a/tests/unittests/test_markdown_doc_render.py +++ b/tests/unittests/test_markdown_doc_render.py @@ -6,7 +6,7 @@ https://github.com/antirez/redis-doc/commit/02b3d1a345093c1794fd86273e9d516fffd3 """ import pytest -from importlib_resources import read_text +from importlib.resources import read_text from iredis.commands import commands_summary from iredis.data import commands as commands_data -- cgit v1.2.3