From 414e9f2a1c5b8fe0c5ec6edbf6c6769c65239a06 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 8 Oct 2022 13:03:49 +0300 Subject: [PATCH 1/3] Test `test_get_moveable_keys` was broken --- tests/test_command_parser.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test_command_parser.py b/tests/test_command_parser.py index 708c069339..e5c8f56e91 100644 --- a/tests/test_command_parser.py +++ b/tests/test_command_parser.py @@ -51,21 +51,21 @@ def test_get_moveable_keys(self, r): ] args7 = ["MIGRATE", "192.168.1.34", 6379, "key1", 0, 5000] - assert commands_parser.get_keys(r, *args1).sort() == ["key1", "key2"].sort() + assert sorted(commands_parser.get_keys(r, *args1)) == sorted(["key1", "key2"]) assert ( - commands_parser.get_keys(r, *args2).sort() == ["mystream", "writers"].sort() + sorted(commands_parser.get_keys(r, *args2)) == sorted(["mystream", "writers"]) ) assert ( - commands_parser.get_keys(r, *args3).sort() - == ["out", "zset1", "zset2"].sort() + sorted(commands_parser.get_keys(r, *args3)) + == sorted(["out", "zset1", "zset2"]) ) - assert commands_parser.get_keys(r, *args4).sort() == ["Sicily", "out"].sort() - assert commands_parser.get_keys(r, *args5).sort() == ["foo"].sort() + assert sorted(commands_parser.get_keys(r, *args4)) == sorted(["Sicily", "out"]) + assert sorted(commands_parser.get_keys(r, *args5)) == ["foo"] assert ( - commands_parser.get_keys(r, *args6).sort() - == ["key1", "key2", "key3"].sort() + sorted(commands_parser.get_keys(r, *args6)) + == sorted(["key1", "key2", "key3"]) ) - assert commands_parser.get_keys(r, *args7).sort() == ["key1"].sort() + assert sorted(commands_parser.get_keys(r, *args7)) == ["key1"] # A bug in redis<7.0 causes this to fail: https://github.com/redis/redis/issues/9493 @skip_if_server_version_lt("7.0.0") From 6bfdd6a5354acfa1380dec19840842f9ec73d2b2 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 8 Oct 2022 13:06:55 +0300 Subject: [PATCH 2/3] Update test_command_parser.py --- tests/test_command_parser.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_command_parser.py b/tests/test_command_parser.py index e5c8f56e91..05024548eb 100644 --- a/tests/test_command_parser.py +++ b/tests/test_command_parser.py @@ -53,7 +53,8 @@ def test_get_moveable_keys(self, r): assert sorted(commands_parser.get_keys(r, *args1)) == sorted(["key1", "key2"]) assert ( - sorted(commands_parser.get_keys(r, *args2)) == sorted(["mystream", "writers"]) + sorted(commands_parser.get_keys(r, *args2)) + == sorted(["mystream", "writers"]) ) assert ( sorted(commands_parser.get_keys(r, *args3)) From d39b4f8304eaead57c320932c7970777d26033f8 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 8 Oct 2022 13:27:41 +0300 Subject: [PATCH 3/3] Do not sort constant lists --- tests/test_command_parser.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/tests/test_command_parser.py b/tests/test_command_parser.py index 05024548eb..6c3ede9cdf 100644 --- a/tests/test_command_parser.py +++ b/tests/test_command_parser.py @@ -51,21 +51,12 @@ def test_get_moveable_keys(self, r): ] args7 = ["MIGRATE", "192.168.1.34", 6379, "key1", 0, 5000] - assert sorted(commands_parser.get_keys(r, *args1)) == sorted(["key1", "key2"]) - assert ( - sorted(commands_parser.get_keys(r, *args2)) - == sorted(["mystream", "writers"]) - ) - assert ( - sorted(commands_parser.get_keys(r, *args3)) - == sorted(["out", "zset1", "zset2"]) - ) - assert sorted(commands_parser.get_keys(r, *args4)) == sorted(["Sicily", "out"]) + assert sorted(commands_parser.get_keys(r, *args1)) == ["key1", "key2"] + assert sorted(commands_parser.get_keys(r, *args2)) == ["mystream", "writers"] + assert sorted(commands_parser.get_keys(r, *args3)) == ["out", "zset1", "zset2"] + assert sorted(commands_parser.get_keys(r, *args4)) == ["Sicily", "out"] assert sorted(commands_parser.get_keys(r, *args5)) == ["foo"] - assert ( - sorted(commands_parser.get_keys(r, *args6)) - == sorted(["key1", "key2", "key3"]) - ) + assert sorted(commands_parser.get_keys(r, *args6)) == ["key1", "key2", "key3"] assert sorted(commands_parser.get_keys(r, *args7)) == ["key1"] # A bug in redis<7.0 causes this to fail: https://github.com/redis/redis/issues/9493