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

server: report redis version 7.2.0 to support Sidekiq #4286

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+4 −4
Open

server: report redis version 7.2.0 to support Sidekiq #4286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9029b03
server: report redis version 7.2.0 to support Sidekiq
adiholden Dec 10, 2024
75f272d
fix test
adiholden Dec 12, 2024
51bcdcd
fix test
adiholden Dec 12, 2024
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
4 changes: 2 additions & 2 deletions src/server/dragonfly_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,15 +305,15 @@ TEST_F(DflyEngineTestWithRegistry, Hello) {

EXPECT_THAT(
resp.GetVec(),
ElementsAre("server", "redis", "version", "6.2.11", "dragonfly_version",
ElementsAre("server", "redis", "version", "7.2.0", "dragonfly_version",
ArgType(RespExpr::STRING), "proto", IntArg(2), "id", ArgType(RespExpr::INT64),
"mode", testing::AnyOf("standalone", "cluster"), "role", "master"));

resp = Run({"hello", "3"});
ASSERT_THAT(resp, ArrLen(14));
EXPECT_THAT(
resp.GetVec(),
ElementsAre("server", "redis", "version", "6.2.11", "dragonfly_version",
ElementsAre("server", "redis", "version", "7.2.0", "dragonfly_version",
ArgType(RespExpr::STRING), "proto", IntArg(3), "id", ArgType(RespExpr::INT64),
"mode", testing::AnyOf("standalone", "cluster"), "role", "master"));

Expand Down
2 changes: 1 addition & 1 deletion src/server/server_family.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ using strings::HumanReadableNumBytes;

namespace {

const auto kRedisVersion = "6.2.11";
const auto kRedisVersion = "7.2.0";

using EngineFunc = void (ServerFamily::*)(CmdArgList args, const CommandContext&);

Expand Down
2 changes: 1 addition & 1 deletion tests/dragonfly/acl_family_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ async def test_auth_resp3_bug(df_factory):
await client.execute_command("ACL SETUSER kostas +@all ON >tmp")
res = await client.execute_command("HELLO 3 AUTH kostas tmp")
assert res["server"] == "redis"
assert res["version"] == "6.2.11"
assert res["version"] == "7.2.0"
assert res["proto"] == 3
assert res["mode"] == "standalone"
assert res["role"] == "master"
Expand Down
Loading