Skip to content

Updating hybrid tests to be compatible with 8.4 and 8.6 changes. Adding 8.6 RC1 image to test matrix #3922

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

Merged
petyaslavova merged 4 commits into from
Jan 28, 2026
+479 −335
Merged

Updating hybrid tests to be compatible with 8.4 and 8.6 changes. Adding 8.6 RC1 image to test matrix #3922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71bcff9
Updating hybrid tests to be compatible with 8.4 and 8.6 changes. Addi…
petyaslavova Jan 27, 2026
1899edf
Fix default command polocies test - json debug policies are updated f…
petyaslavova Jan 28, 2026
2bd5124
Fixind expected default policies map
petyaslavova Jan 28, 2026
863cf53
Merge branch 'master' into ps_fix_hybrid_tests_for_8_6
petyaslavova Jan 28, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/integration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
max-parallel: 15
fail-fast: false
matrix:
redis-version: ['${{ needs.redis_version.outputs.CURRENT }}', '8.2', '8.0.2' ,'7.4.4', '7.2.9']
redis-version: ['8.6-rc1-21356658603-debian-amd64', '${{ needs.redis_version.outputs.CURRENT }}', '8.2', '8.0.2' ,'7.4.4', '7.2.9']
python-version: ['3.10', '3.14']
parser-backend: ['plain']
event-loop: ['asyncio']
Expand Down
142 changes: 142 additions & 0 deletions tests/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
from time import sleep
from typing import Callable

from redis._parsers.commands import RequestPolicy, ResponsePolicy


def wait_for_condition(
predicate: Callable[[], bool],
Expand Down Expand Up @@ -45,3 +47,143 @@ def wait_for_condition(
sleep(check_interval)

raise AssertionError(error_message)


def get_expected_command_policies(changes_in_defaults={}):
default_cmd_policies = {
"core": {
"keys": [
"keys",
RequestPolicy.ALL_SHARDS,
ResponsePolicy.DEFAULT_KEYLESS,
],
"acl setuser": [
"acl setuser",
RequestPolicy.ALL_NODES,
ResponsePolicy.ALL_SUCCEEDED,
],
"exists": ["exists", RequestPolicy.MULTI_SHARD, ResponsePolicy.AGG_SUM],
"config resetstat": [
"config resetstat",
RequestPolicy.ALL_NODES,
ResponsePolicy.ALL_SUCCEEDED,
],
"slowlog len": [
"slowlog len",
RequestPolicy.ALL_NODES,
ResponsePolicy.AGG_SUM,
],
"scan": ["scan", RequestPolicy.SPECIAL, ResponsePolicy.SPECIAL],
"latency history": [
"latency history",
RequestPolicy.ALL_NODES,
ResponsePolicy.SPECIAL,
],
"memory doctor": [
"memory doctor",
RequestPolicy.ALL_SHARDS,
ResponsePolicy.SPECIAL,
],
"randomkey": [
"randomkey",
RequestPolicy.ALL_SHARDS,
ResponsePolicy.SPECIAL,
],
"mget": [
"mget",
RequestPolicy.MULTI_SHARD,
ResponsePolicy.DEFAULT_KEYED,
],
"function restore": [
"function restore",
RequestPolicy.ALL_SHARDS,
ResponsePolicy.ALL_SUCCEEDED,
],
},
"json": {
"debug": [
"debug",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"get": [
"get",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"ft": {
"search": [
"search",
RequestPolicy.DEFAULT_KEYLESS,
ResponsePolicy.DEFAULT_KEYLESS,
],
"create": [
"create",
RequestPolicy.DEFAULT_KEYLESS,
ResponsePolicy.DEFAULT_KEYLESS,
],
},
"bf": {
"add": [
"add",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"madd": [
"madd",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"cf": {
"add": [
"add",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"mexists": [
"mexists",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"tdigest": {
"add": [
"add",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"min": [
"min",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"ts": {
"create": [
"create",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"info": [
"info",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"topk": {
"list": [
"list",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"query": [
"query",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
}
default_cmd_policies.update(changes_in_defaults)
return default_cmd_policies
152 changes: 24 additions & 128 deletions tests/test_asyncio/test_command_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,151 +2,47 @@

from redis._parsers import AsyncCommandsParser
from redis._parsers.commands import RequestPolicy, ResponsePolicy
from tests.conftest import skip_if_server_version_lt
from tests.conftest import skip_if_server_version_gte, skip_if_server_version_lt
from tests.helpers import get_expected_command_policies


@pytest.mark.onlycluster
@skip_if_server_version_lt("8.0.0")
class TestAsyncCommandParser:
@pytest.mark.asyncio
@skip_if_server_version_gte("8.5.240")
async def test_get_command_policies(self, r):
commands_parser = AsyncCommandsParser()
await commands_parser.initialize(node=r.get_default_node())
expected_command_policies = {
"core": {
"keys": [
"keys",
RequestPolicy.ALL_SHARDS,
ResponsePolicy.DEFAULT_KEYLESS,
],
"acl setuser": [
"acl setuser",
RequestPolicy.ALL_NODES,
ResponsePolicy.ALL_SUCCEEDED,
],
"exists": ["exists", RequestPolicy.MULTI_SHARD, ResponsePolicy.AGG_SUM],
"config resetstat": [
"config resetstat",
RequestPolicy.ALL_NODES,
ResponsePolicy.ALL_SUCCEEDED,
],
"slowlog len": [
"slowlog len",
RequestPolicy.ALL_NODES,
ResponsePolicy.AGG_SUM,
],
"scan": ["scan", RequestPolicy.SPECIAL, ResponsePolicy.SPECIAL],
"latency history": [
"latency history",
RequestPolicy.ALL_NODES,
ResponsePolicy.SPECIAL,
],
"memory doctor": [
"memory doctor",
RequestPolicy.ALL_SHARDS,
ResponsePolicy.SPECIAL,
],
"randomkey": [
"randomkey",
RequestPolicy.ALL_SHARDS,
ResponsePolicy.SPECIAL,
],
"mget": [
"mget",
RequestPolicy.MULTI_SHARD,
ResponsePolicy.DEFAULT_KEYED,
],
"function restore": [
"function restore",
RequestPolicy.ALL_SHARDS,
ResponsePolicy.ALL_SUCCEEDED,
],
},
expected_command_policies = get_expected_command_policies()

actual_policies = await commands_parser.get_command_policies()
assert len(actual_policies) > 0

for module_name, commands in expected_command_policies.items():
for command, command_policies in commands.items():
assert command in actual_policies[module_name]
assert command_policies == [
command,
actual_policies[module_name][command].request_policy,
actual_policies[module_name][command].response_policy,
]

@skip_if_server_version_lt("8.5.240")
@pytest.mark.asyncio
async def test_get_command_policies_json_debug_updated(self, r):
commands_parser = AsyncCommandsParser()
await commands_parser.initialize(node=r.get_default_node())
changes_in_defaults = {
"json": {
"debug": [
"debug",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"get": [
"get",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"ft": {
"search": [
"search",
RequestPolicy.DEFAULT_KEYLESS,
ResponsePolicy.DEFAULT_KEYLESS,
],
"create": [
"create",
RequestPolicy.DEFAULT_KEYLESS,
ResponsePolicy.DEFAULT_KEYLESS,
],
},
"bf": {
"add": [
"add",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"madd": [
"madd",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"cf": {
"add": [
"add",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"mexists": [
"mexists",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"tdigest": {
"add": [
"add",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"min": [
"min",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"ts": {
"create": [
"create",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"info": [
"info",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
"topk": {
"list": [
"list",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
"query": [
"query",
RequestPolicy.DEFAULT_KEYED,
ResponsePolicy.DEFAULT_KEYED,
],
},
}
expected_command_policies = get_expected_command_policies(changes_in_defaults)

actual_policies = await commands_parser.get_command_policies()
assert len(actual_policies) > 0
Expand Down
Loading