fix flaky tests

components/cqrs/command_processor_test.go

@@ -2,6 +2,7 @@ package cqrs_test
 
 import (
 	"context"
+	"sync/atomic"
 	"testing"
 	"time"
 
@@ -366,7 +367,7 @@ func TestNewCommandProcessor_OnHandle(t *testing.T) {
 		return nil
 	})
 
-	onHandleCalled := 0
+	onHandleCalled := int64(0)
 
 	config := cqrs.CommandProcessorConfig{
 		GenerateSubscribeTopic: func(params cqrs.CommandProcessorGenerateSubscribeTopicParams) (string, error) {
@@ -376,7 +377,7 @@ func TestNewCommandProcessor_OnHandle(t *testing.T) {
 			return mockSub, nil
 		},
 		OnHandle: func(params cqrs.CommandProcessorOnHandleParams) error {
-			onHandleCalled++
+			atomic.AddInt64(&onHandleCalled, 1)
 
 			assert.IsType(t, &TestCommand{}, params.Command)
 			assert.Equal(t, "cqrs_test.TestCommand", params.CommandName)
@@ -422,7 +423,7 @@ func TestNewCommandProcessor_OnHandle(t *testing.T) {
 		// nack received
 	}
 
-	assert.Equal(t, 2, onHandleCalled)
+	assert.EqualValues(t, 2, onHandleCalled)
 }
 
 func TestCommandProcessor_AddHandlersToRouter_without_disableRouterAutoAddHandlers(t *testing.T) {

components/requestreply/requestreply_test.go

@@ -370,20 +370,22 @@ func TestRequestReply_without_result_multiple_replies(t *testing.T) {
 		DoNotAckOnCommandErrors: true,
 	})
 
-	i := 0
+	type toSend struct {
+		ID  string
+		Err error
+	}
+
+	toSendCh := make(chan toSend, 1)
+	toSendCh <- toSend{ID: "1", Err: fmt.Errorf("error 1")}
 
 	err := ts.CommandProcessor.AddHandlers(
 		requestreply.NewCommandHandlerWithResult[TestCommand, TestCommandResult](
 			"test_handler",
 			ts.RequestReplyBackend,
 			func(ctx context.Context, cmd *TestCommand) (TestCommandResult, error) {
-				i++
-
-				if i == 3 {
-					return TestCommandResult{ID: fmt.Sprintf("%d", i)}, nil
-				}
+				toSend := <-toSendCh
 
-				return TestCommandResult{ID: fmt.Sprintf("%d", i)}, fmt.Errorf("error %d", i)
+				return TestCommandResult{ID: toSend.ID}, toSend.Err
 			},
 		),
 	)
@@ -413,6 +415,8 @@ func TestRequestReply_without_result_multiple_replies(t *testing.T) {
 		t.Fatal("timeout")
 	}
 
+	toSendCh <- toSend{ID: "2", Err: fmt.Errorf("error 2")}
+
 	select {
 	case reply := <-replyCh:
 		assert.EqualValues(t, TestCommandResult{ID: "2"}, reply.HandlerResult)
@@ -425,6 +429,8 @@ func TestRequestReply_without_result_multiple_replies(t *testing.T) {
 		t.Fatal("timeout")
 	}
 
+	toSendCh <- toSend{ID: "3", Err: nil}
+
 	select {
 	case reply := <-replyCh:
 		assert.EqualValues(t, TestCommandResult{ID: "3"}, reply.HandlerResult)