From 9d42d05ff0821723e8d3ece514156f75bd5f51e5 Mon Sep 17 00:00:00 2001
From: Malte Bauch <malte.bauch@h-da.de>
Date: Fri, 25 Apr 2025 14:05:01 +0200
Subject: [PATCH] Remove unnecessary call of defer from within t.Cleanup()

---
 .../infrastructure/interaction/health_test.go |  2 +-
 .../interaction/routing_test.go               |  2 +-
 .../infrastructure/interaction/health_test.go |  2 +-
 .../interaction/routing_test.go               | 29 ++++++++++---------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ctrl/internal/infrastructure/interaction/health_test.go b/ctrl/internal/infrastructure/interaction/health_test.go
index 2e78994c..e2c5876b 100644
--- a/ctrl/internal/infrastructure/interaction/health_test.go
+++ b/ctrl/internal/infrastructure/interaction/health_test.go
@@ -71,7 +71,7 @@ func TestHealthServer_Health(t *testing.T) {
 
 	client, closer := getTestServer()
 	t.Cleanup(func() {
-		defer closer()
+		closer()
 	})
 
 	type expectation struct {
diff --git a/ctrl/internal/infrastructure/interaction/routing_test.go b/ctrl/internal/infrastructure/interaction/routing_test.go
index 0b5dcc3d..313bf9ca 100644
--- a/ctrl/internal/infrastructure/interaction/routing_test.go
+++ b/ctrl/internal/infrastructure/interaction/routing_test.go
@@ -75,7 +75,7 @@ func TestRoutingServer_RequestRoute(t *testing.T) {
 
 	client, closer := getTestRoutingServer()
 	t.Cleanup(func() {
-		defer closer()
+		closer()
 	})
 
 	type expectation struct {
diff --git a/kms/internal/infrastructure/interaction/health_test.go b/kms/internal/infrastructure/interaction/health_test.go
index 73018c76..57bb1280 100644
--- a/kms/internal/infrastructure/interaction/health_test.go
+++ b/kms/internal/infrastructure/interaction/health_test.go
@@ -71,7 +71,7 @@ func TestHealthServer_Health(t *testing.T) {
 
 	client, closer := getTestServer()
 	t.Cleanup(func() {
-		defer closer()
+		closer()
 	})
 
 	type expectation struct {
diff --git a/kms/internal/infrastructure/interaction/routing_test.go b/kms/internal/infrastructure/interaction/routing_test.go
index ba61d83a..604e4aad 100644
--- a/kms/internal/infrastructure/interaction/routing_test.go
+++ b/kms/internal/infrastructure/interaction/routing_test.go
@@ -87,7 +87,7 @@ func TestRoutingServer_AddRoute(t *testing.T) {
 
 		client, closer, _ := getTestRoutingServer()
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		req := &pb.AddRouteRequest{
@@ -111,7 +111,7 @@ func TestRoutingServer_AddRoute(t *testing.T) {
 
 		client, closer, _ := getTestRoutingServer()
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		req := &pb.AddRouteRequest{
@@ -139,7 +139,7 @@ func TestRoutingServer_AddRoute(t *testing.T) {
 		client, closer, _ := getTestRoutingServer()
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		req := &pb.AddRouteRequest{
@@ -176,7 +176,7 @@ func TestRoutingServer_DeleteRoute(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		deleteReq := &pb.DeleteRouteRequest{
@@ -201,7 +201,7 @@ func TestRoutingServer_DeleteRoute(t *testing.T) {
 		client, closer, _ := getTestRoutingServer()
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		deleteReq := &pb.DeleteRouteRequest{
@@ -234,7 +234,7 @@ func TestRoutingServer_GetRoute(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		getResp, err := client.GetRoute(ctx, &pb.GetRouteRequest{
@@ -251,7 +251,7 @@ func TestRoutingServer_GetRoute(t *testing.T) {
 		client, closer, _ := getTestRoutingServer()
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		getResp, err := client.GetRoute(ctx, &pb.GetRouteRequest{
@@ -268,7 +268,7 @@ func TestRoutingServer_GetRoute(t *testing.T) {
 		client, closer, _ := getTestRoutingServer()
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		getResp, err := client.GetRoute(ctx, &pb.GetRouteRequest{
@@ -289,7 +289,7 @@ func TestRoutingServer_GetRouteList(t *testing.T) {
 		client, closer, _ := getTestRoutingServer()
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		getResp, err := client.GetRouteList(ctx, &pb.GetRouteListRequest{})
@@ -325,7 +325,7 @@ func TestRoutingServer_GetRouteList(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		getResp, err := client.GetRouteList(ctx, &pb.GetRouteListRequest{})
@@ -365,7 +365,7 @@ func TestRoutingServer_UpdateRoute(t *testing.T) {
 		require.NoError(t, err)
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		updateReq := &pb.UpdateRouteRequest{
@@ -395,7 +395,7 @@ func TestRoutingServer_UpdateRoute(t *testing.T) {
 		client, closer, _ := getTestRoutingServer()
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		updateReq := &pb.UpdateRouteRequest{
@@ -419,7 +419,7 @@ func TestRoutingServer_UpdateRoute(t *testing.T) {
 		client, closer, _ := getTestRoutingServer()
 
 		t.Cleanup(func() {
-			defer closer()
+			closer()
 		})
 
 		updateReq := &pb.UpdateRouteRequest{
@@ -447,7 +447,8 @@ func compareRouteToModel(
 	assert.Equal(t, expected.ID.String(), actual.GetId())
 	assert.Equal(t, expected.NextHopId, actual.GetNextHopId())
 	assert.Equal(t, expected.PrevHopId, actual.GetPrevHopId())
-	assert.Equal(t, expected.CryptoAlgorithm, model.CryptoAlgorithm(actual.GetCryptoAlgorithm()))
+	assert.Equal(t, expected.CryptoAlgorithm,
+		model.CryptoAlgorithm(actual.GetCryptoAlgorithm()))
 }
 
 func compareRoutes(
-- 
GitLab