Add testutil.TempDir for common handling of cleanup on Windows

mafredri · mafredri · commit 3f1f23e0a654 · 2023-01-16T16:31:23.000Z
diff --git a/cli/server_test.go b/cli/server_test.go
@@ -1134,7 +1134,7 @@ func TestServer(t *testing.T) {
 
 			random, err := cryptorand.String(5)
 			require.NoError(t, err)
-			tmpdir := t.TempDir()
+			tmpdir := testutil.TempDir(t)
 			fiName := fmt.Sprint(tmpdir, "/coder-logging-test-", random)
 
 			root, _ := clitest.New(t,
@@ -1163,7 +1163,7 @@ func TestServer(t *testing.T) {
 			ctx, cancelFunc := context.WithCancel(context.Background())
 			defer cancelFunc()
 
-			tmpdir := t.TempDir()
+			tmpdir := testutil.TempDir(t)
 			fi, err := os.CreateTemp(tmpdir, "coder-logging-test-*")
 			require.NoError(t, err)
 
@@ -1193,7 +1193,7 @@ func TestServer(t *testing.T) {
 			ctx, cancelFunc := context.WithCancel(context.Background())
 			defer cancelFunc()
 
-			tmpdir := t.TempDir()
+			tmpdir := testutil.TempDir(t)
 			fi, err := os.CreateTemp(tmpdir, "coder-logging-test-*")
 			require.NoError(t, err)
 
@@ -1223,7 +1223,7 @@ func TestServer(t *testing.T) {
 			ctx, cancelFunc := context.WithCancel(context.Background())
 			defer cancelFunc()
 
-			tmpdir := t.TempDir()
+			tmpdir := testutil.TempDir(t)
 			fi, err := os.CreateTemp(tmpdir, "coder-logging-test-*")
 			require.NoError(t, err)
 
@@ -1266,7 +1266,7 @@ func TestServer(t *testing.T) {
 			ctx, cancelFunc := context.WithCancel(context.Background())
 			defer cancelFunc()
 
-			tmpdir := t.TempDir()
+			tmpdir := testutil.TempDir(t)
 			fi1, err := os.CreateTemp(tmpdir, "coder-logging-test-*")
 			require.NoError(t, err)
 			fi2, err := os.CreateTemp(tmpdir, "coder-logging-test-*")
diff --git a/testutil/temp.go b/testutil/temp.go
@@ -0,0 +1,28 @@
+package testutil
+
+import (
+	"os"
+	"runtime"
+	"testing"
+)
+
+func TempDir(t *testing.T) string {
+	t.Helper()
+	dir := t.TempDir()
+	t.Cleanup(func() {
+		if runtime.GOOS == "windows" {
+			tries := 50
+			var err error
+			for i := 0; i < tries; i++ {
+				err = os.RemoveAll(dir)
+				if err == nil {
+					return
+				}
+			}
+			// Note that even though we're giving up here, t.TempDir
+			// cleanup _could_ still succeed (or fail the test).
+			t.Logf("TempDir: delete %q: giving up after %d tries: %v", dir, tries, err)
+		}
+	})
+	return dir
+}
