From 572a8d05c16d0b1a4840cac5a0d08019098453e6 Mon Sep 17 00:00:00 2001 From: Prashant Shubham Date: Tue, 22 Oct 2024 22:19:59 +0530 Subject: [PATCH] Fix master build (#46) --- internal/tests/integration/commands/incr_test.go | 6 +++--- internal/tests/integration/commands/pfadd_test.go | 2 +- internal/tests/integration/commands/pfcount_test.go | 2 +- internal/tests/integration/commands/pfmerge_test.go | 2 +- internal/tests/integration/setup/setup_dicedb_container.go | 3 ++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/tests/integration/commands/incr_test.go b/internal/tests/integration/commands/incr_test.go index cd0861f..7cdae88 100644 --- a/internal/tests/integration/commands/incr_test.go +++ b/internal/tests/integration/commands/incr_test.go @@ -110,11 +110,11 @@ func TestIncr(t *testing.T) { }, Result: []TestCaseResult{ {Expected: "OK"}, - {ErrorExpected: true, Expected: "(error) ERR WRONGTYPE Operation against a key holding the wrong kind of value"}, + {ErrorExpected: true, Expected: "(error) ERR value is not an integer or out of range"}, {Expected: "OK"}, - {ErrorExpected: true, Expected: "(error) ERR WRONGTYPE Operation against a key holding the wrong kind of value"}, + {ErrorExpected: true, Expected: "(error) ERR value is not an integer or out of range"}, {Expected: "OK"}, - {ErrorExpected: true, Expected: "(error) ERR WRONGTYPE Operation against a key holding the wrong kind of value"}, + {ErrorExpected: true, Expected: "(error) ERR value is not an integer or out of range"}, }, }, } diff --git a/internal/tests/integration/commands/pfadd_test.go b/internal/tests/integration/commands/pfadd_test.go index 1250a57..9fd5eaa 100644 --- a/internal/tests/integration/commands/pfadd_test.go +++ b/internal/tests/integration/commands/pfadd_test.go @@ -48,7 +48,7 @@ func TestPfAdd(t *testing.T) { }, Result: []TestCaseResult{ {Expected: "OK"}, - {ErrorExpected: true, Expected: "(error) WRONGTYPE Key is not a valid HyperLogLog string value."}, + {ErrorExpected: true, Expected: "(error) WRONGTYPE Key is not a valid HyperLogLog string value"}, }, }, } diff --git a/internal/tests/integration/commands/pfcount_test.go b/internal/tests/integration/commands/pfcount_test.go index b8e62df..25f9557 100644 --- a/internal/tests/integration/commands/pfcount_test.go +++ b/internal/tests/integration/commands/pfcount_test.go @@ -28,7 +28,7 @@ func TestPfCount(t *testing.T) { }, Result: []TestCaseResult{ {Expected: "OK"}, - {ErrorExpected: true, Expected: "(error) WRONGTYPE Key is not a valid HyperLogLog string value."}, + {ErrorExpected: true, Expected: "(error) WRONGTYPE Key is not a valid HyperLogLog string value"}, }, }, { diff --git a/internal/tests/integration/commands/pfmerge_test.go b/internal/tests/integration/commands/pfmerge_test.go index 19ee5a8..8615a2f 100644 --- a/internal/tests/integration/commands/pfmerge_test.go +++ b/internal/tests/integration/commands/pfmerge_test.go @@ -61,7 +61,7 @@ func TestPfMerge(t *testing.T) { }, Result: []TestCaseResult{ {Expected: "OK"}, - {ErrorExpected: true, Expected: "(error) WRONGTYPE Key is not a valid HyperLogLog string value."}, + {ErrorExpected: true, Expected: "(error) WRONGTYPE Key is not a valid HyperLogLog string value"}, }, }, } diff --git a/internal/tests/integration/setup/setup_dicedb_container.go b/internal/tests/integration/setup/setup_dicedb_container.go index 364e62a..ade99a0 100644 --- a/internal/tests/integration/setup/setup_dicedb_container.go +++ b/internal/tests/integration/setup/setup_dicedb_container.go @@ -16,8 +16,9 @@ func InitializeDiceDBContainer(ctx context.Context) (*DiceDBContainer, error) { req := testcontainers.ContainerRequest{ Image: "dicedb/dicedb:latest", ExposedPorts: []string{"7379/tcp"}, - WaitingFor: wait.ForLog("HTTP Server running"), + WaitingFor: wait.ForLog("starting DiceDB"), } + diceDBContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ ContainerRequest: req, Started: true,