Make temp dir removal consistent with others

client/testserver/gitalyserver.go

@@ -92,10 +92,9 @@ func StartGitalyServer(t *testing.T, network string) (string, *TestGitalyServer)
 		// for more detail.
 		tempDir, err := os.MkdirTemp("", "gitaly")
 		require.NoError(t, err)
-
-		gitalySocketPath := path.Join(tempDir, "gitaly.sock")
 		t.Cleanup(func() { require.NoError(t, os.RemoveAll(tempDir)) })
 
+		gitalySocketPath := path.Join(tempDir, "gitaly.sock")
 		err = os.MkdirAll(filepath.Dir(gitalySocketPath), 0700)
 		require.NoError(t, err)
 

client/testserver/testserver.go

@@ -33,7 +33,7 @@ func StartSocketHttpServer(t *testing.T, handlers []TestRequestHandler) string {
 	// for more detail.
 	tempDir, err := os.MkdirTemp("", "http")
 	require.NoError(t, err)
-	t.Cleanup(func() { os.RemoveAll(tempDir) })
+	t.Cleanup(func() { require.NoError(t, os.RemoveAll(tempDir)) })
 
 	testSocket := path.Join(tempDir, "internal.sock")
 	err = os.MkdirAll(filepath.Dir(testSocket), 0700)

cmd/gitlab-sshd/acceptance_test.go

@@ -263,7 +263,7 @@ func configureSSHD(t *testing.T, apiServer string) (string, ed25519.PublicKey) {
 	t.Helper()
 
 	tempDir := t.TempDir()
-	t.Cleanup(func() { os.RemoveAll(tempDir) })
+	t.Cleanup(func() { require.NoError(t, os.RemoveAll(tempDir)) })
 
 	configFile := filepath.Join(tempDir, "config.yml")
 	hostKeyFile := filepath.Join(tempDir, "hostkey")

internal/logger/logger_test.go

@@ -62,7 +62,7 @@ func TestConfigureWithDebugLogLevel(t *testing.T) {
 
 func TestConfigureWithPermissionError(t *testing.T) {
 	tempDir := t.TempDir()
-	defer os.RemoveAll(tempDir)
+	t.Cleanup(func() { require.NoError(t, os.RemoveAll(tempDir)) })
 
 	config := config.Config{
 		LogFile:   tempDir,

internal/testhelper/testhelper.go

@@ -34,7 +34,7 @@ func PrepareTestRootDir(t *testing.T) {
 
 	require.NoError(t, os.MkdirAll(TestRoot, 0700))
 
-	t.Cleanup(func() { os.RemoveAll(TestRoot) })
+	t.Cleanup(func() { require.NoError(t, os.RemoveAll(TestRoot)) })
 
 	require.NoError(t, copyTestData())