Refactor to work with t.Cleanup

Resolves: #991 (comment)
grafana · Aug 3, 2023 · f2cb59a · f2cb59a
1 parent 43ff9a0
commit f2cb59a
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/tests/browser_test.go b/tests/browser_test.go
@@ -70,10 +70,12 @@ func TestTmpDirCleanup(t *testing.T) {
 	t.Parallel()
 
 	tmpDirPath, err := os.MkdirTemp("./", "")
-	defer func() {
-		err := os.RemoveAll(tmpDirPath)
-		require.NoError(t, err)
-	}()
+	t.Cleanup(
+		func() {
+			err := os.RemoveAll(tmpDirPath)
+			require.NoError(t, err)
+		},
+	)
 	require.NoError(t, err)
 
 	b := newTestBrowser(
@@ -100,10 +102,12 @@ func TestTmpDirCleanupOnContextClose(t *testing.T) {
 	t.Parallel()
 
 	tmpDirPath, err := os.MkdirTemp("./", "")
-	defer func() {
-		err := os.RemoveAll(tmpDirPath)
-		require.NoError(t, err)
-	}()
+	t.Cleanup(
+		func() {
+			err := os.RemoveAll(tmpDirPath)
+			require.NoError(t, err)
+		},
+	)
 	require.NoError(t, err)
 
 	b := newTestBrowser(