Merge branch 'id-refactor-cleanup' into 'main'

Replace cleanup functions with t.Cleanup

See merge request gitlab-org/gitlab-shell!460

2 files changed, 4 insertions, 7 deletions

diff --git a/internal/command/uploadpack/gitalycall_test.go b/internal/command/uploadpack/gitalycall_test.go
index e94a628..d945764 100644
--- a/internal/command/uploadpack/gitalycall_test.go
+++ b/internal/command/uploadpack/gitalycall_test.go
@@ -17,12 +17,10 @@ import (
 )
 
 func TestUploadPack(t *testing.T) {
-	gitalyAddress, testServer, cleanup := testserver.StartGitalyServer(t)
-	defer cleanup()
+	gitalyAddress, testServer := testserver.StartGitalyServer(t)
 
 	requests := requesthandlers.BuildAllowedWithGitalyHandlers(t, gitalyAddress)
-	url, cleanup := testserver.StartHttpServer(t, requests)
-	defer cleanup()
+	url := testserver.StartHttpServer(t, requests)
 
 	output := &bytes.Buffer{}
 	input := &bytes.Buffer{}
@@ -42,7 +40,7 @@ func TestUploadPack(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Equal(t, "UploadPack: "+repo, output.String())
-	require.Eventually(t, func() bool{
+	require.Eventually(t, func() bool {
 		entries := hook.AllEntries()
 
 		require.Equal(t, 2, len(entries))
diff --git a/internal/command/uploadpack/uploadpack_test.go b/internal/command/uploadpack/uploadpack_test.go
index 20edb57..7b43ded 100644
--- a/internal/command/uploadpack/uploadpack_test.go
+++ b/internal/command/uploadpack/uploadpack_test.go
@@ -16,8 +16,7 @@ import (
 
 func TestForbiddenAccess(t *testing.T) {
 	requests := requesthandlers.BuildDisallowedByApiHandlers(t)
-	url, cleanup := testserver.StartHttpServer(t, requests)
-	defer cleanup()
+	url := testserver.StartHttpServer(t, requests)
 
 	output := &bytes.Buffer{}