From cb09d8e15dc18b9d8e8dd3e5d0de0f29e7e4efa4 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Fri, 23 Apr 2021 09:56:50 +0200 Subject: testhelper: Convert `TempDir()` to use `t.Cleanup()` Convert `TempDir()` to use `t.Cleanup()` instead of returning a cleanup function. --- cmd/gitaly-hooks/hooks_test.go | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'cmd/gitaly-hooks') diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index de1633e95..a79baf910 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -104,8 +104,7 @@ func testMain(m *testing.M) int { } func TestHooksPrePostWithSymlinkedStoragePath(t *testing.T) { - tempDir, cleanup := testhelper.TempDir(t) - defer cleanup() + tempDir := testhelper.TempDir(t) cfg, repo, repoPath := testcfg.BuildWithRepo(t) testhelper.ConfigureGitalyHooksBin(t, cfg) @@ -248,8 +247,7 @@ func TestHooksUpdate(t *testing.T) { glUsername := "iamgitlab" glProtocol := "ssh" - customHooksDir, cleanup := testhelper.TempDir(t) - defer cleanup() + customHooksDir := testhelper.TempDir(t) cfg := testcfg.Build(t, testcfg.WithBase(config.Cfg{ Auth: auth.Config{Token: "abc123"}, @@ -283,8 +281,7 @@ func testHooksUpdate(t *testing.T, cfg config.Cfg, glValues glHookValues) { cmd.Env = envForHooks(t, cfg, repo, glValues, proxyValues{}) cmd.Dir = repoPath - tempDir, cleanup := testhelper.TempDir(t) - defer cleanup() + tempDir := testhelper.TempDir(t) customHookArgsPath := filepath.Join(tempDir, "containsarguments") dumpArgsToTempfileScript := fmt.Sprintf(`#!/usr/bin/env ruby @@ -511,8 +508,7 @@ func TestCheckOK(t *testing.T) { serverURL, cleanup := testhelper.NewGitlabTestServer(t, c) defer cleanup() - tempDir, cleanup := testhelper.TempDir(t) - defer cleanup() + tempDir := testhelper.TempDir(t) gitlabShellDir := filepath.Join(tempDir, "gitlab-shell") require.NoError(t, os.MkdirAll(gitlabShellDir, 0755)) @@ -556,8 +552,7 @@ func TestCheckBadCreds(t *testing.T) { serverURL, cleanup := testhelper.NewGitlabTestServer(t, c) defer cleanup() - tempDir, cleanup := testhelper.TempDir(t) - defer cleanup() + tempDir := testhelper.TempDir(t) gitlabShellDir := filepath.Join(tempDir, "gitlab-shell") require.NoError(t, os.MkdirAll(gitlabShellDir, 0755)) @@ -697,8 +692,7 @@ func TestGitalyHooksPackObjects(t *testing.T) { t.Run(tc.desc, func(t *testing.T) { defer runHookServiceServer(t, cfg)() - tempDir, cleanTempDir := testhelper.TempDir(t) - defer cleanTempDir() + tempDir := testhelper.TempDir(t) args := append(baseArgs[1:], tc.extraArgs...) args = append(args, repoPath, tempDir) -- cgit v1.2.3