From 0d08379d0a6e5c91206a82e207c6c05f0f9fddc4 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Wed, 23 Mar 2022 16:04:21 +0800 Subject: all: use `t.TempDir` to create temporary test directory This commit replaces all `ioutil.TempDir` with `t.TempDir` in tests. The directory created by `t.TempDir` is automatically removed when the test and all its subtests complete. Reference: https://pkg.go.dev/testing#T.TempDir Signed-off-by: Eng Zer Jun --- pkg/bisect/bisect_test.go | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'pkg/bisect') diff --git a/pkg/bisect/bisect_test.go b/pkg/bisect/bisect_test.go index 7a05afb36..eebe48e37 100644 --- a/pkg/bisect/bisect_test.go +++ b/pkg/bisect/bisect_test.go @@ -5,8 +5,6 @@ package bisect import ( "fmt" - "io/ioutil" - "os" "strconv" "testing" @@ -84,10 +82,7 @@ func (env *testEnv) headCommit() int { } func createTestRepo(t *testing.T) string { - baseDir, err := ioutil.TempDir("", "syz-bisect-test") - if err != nil { - t.Fatal(err) - } + baseDir := t.TempDir() repo := vcs.CreateTestRepo(t, baseDir, "") if !repo.SupportsBisection() { t.Skip("bisection is unsupported by git (probably too old version)") @@ -432,17 +427,17 @@ func TestBisectionResults(t *testing.T) { // Creating new repos takes majority of the test time, // so we reuse them across tests. repoCache := make(chan string, len(bisectionTests)) - t.Run("group", func(t *testing.T) { + t.Run("group", func(tt *testing.T) { for _, test := range bisectionTests { test := test - t.Run(test.name, func(t *testing.T) { + tt.Run(test.name, func(t *testing.T) { t.Parallel() checkTest(t, test) repoDir := "" select { case repoDir = <-repoCache: default: - repoDir = createTestRepo(t) + repoDir = createTestRepo(tt) } defer func() { repoCache <- repoDir @@ -485,14 +480,6 @@ func TestBisectionResults(t *testing.T) { }) } }) - for { - select { - case dir := <-repoCache: - os.RemoveAll(dir) - default: - return - } - } } func checkTest(t *testing.T, test BisectionTest) { -- cgit mrf-deployment