Adding small test update for temp dir using t.TempDir (#13293)

miledxz · web-flow · commit 2ddb3596ef4d · 2023-12-28T21:49:57.000+01:00
* Adding small test update for temp dir using t.TempDir

Signed-off-by: Mile Druzijanic &lt;miledruz@gmail.com&gt;
Signed-off-by: Mile Druzijanic &lt;zedsprogramms@gmail.com&gt;

* removing not required cleanup

Signed-off-by: Mile Druzijanic &lt;zedsprogramms@gmail.com&gt;

---------

Signed-off-by: Mile Druzijanic &lt;miledruz@gmail.com&gt;
Signed-off-by: Mile Druzijanic &lt;zedsprogramms@gmail.com&gt;
diff --git a/promql/engine_test.go b/promql/engine_test.go
@@ -18,7 +18,6 @@ import (
 	"errors"
 	"fmt"
 	"math"
-	"os"
 	"sort"
 	"testing"
 	"time"
@@ -47,9 +46,7 @@ func TestMain(m *testing.M) {
 func TestQueryConcurrency(t *testing.T) {
 	maxConcurrency := 10
 
-	dir, err := os.MkdirTemp("", "test_concurrency")
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 	queryTracker := NewActiveQueryTracker(dir, maxConcurrency, nil)
 	t.Cleanup(queryTracker.Close)
 
diff --git a/tsdb/tsdbutil/dir_locker_testutil.go b/tsdb/tsdbutil/dir_locker_testutil.go
@@ -60,12 +60,8 @@ func TestDirLockerUsage(t *testing.T, open func(t *testing.T, data string, creat
 
 	for _, c := range cases {
 		t.Run(fmt.Sprintf("%+v", c), func(t *testing.T) {
-			tmpdir, err := os.MkdirTemp("", "test")
-			require.NoError(t, err)
-			t.Cleanup(func() {
-				require.NoError(t, os.RemoveAll(tmpdir))
-			})
-
+			tmpdir := t.TempDir()
+			
 			// Test preconditions (file already exists + lockfile option)
 			if c.fileAlreadyExists {
 				tmpLocker, err := NewDirLocker(tmpdir, "tsdb", log.NewNopLogger(), nil)
@@ -82,7 +78,7 @@ func TestDirLockerUsage(t *testing.T, open func(t *testing.T, data string, creat
 
 			// Check that the lockfile is always deleted
 			if !c.lockFileDisabled {
-				_, err = os.Stat(locker.path)
+				_, err := os.Stat(locker.path)
 				require.True(t, os.IsNotExist(err), "lockfile was not deleted")
 			}
 		})
