From 252031c86f5c6fe7acad504bc6f3162175f347b2 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Sat, 30 Dec 2023 19:13:59 +0000 Subject: [PATCH] Revert "Adding small test update for temp dir using t.TempDir (#13293)" This reverts commit 2ddb3596ef4d2b1de482337ce1943476699b82fb. Various tests are failing in CI after this change; reverting to free up other work. Signed-off-by: Bryan Boreham --- promql/engine_test.go | 5 ++++- tsdb/tsdbutil/dir_locker_testutil.go | 10 +++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/promql/engine_test.go b/promql/engine_test.go index b3e7d4094..105cdc10d 100644 --- a/promql/engine_test.go +++ b/promql/engine_test.go @@ -18,6 +18,7 @@ import ( "errors" "fmt" "math" + "os" "sort" "testing" "time" @@ -46,7 +47,9 @@ func TestMain(m *testing.M) { func TestQueryConcurrency(t *testing.T) { maxConcurrency := 10 - dir := t.TempDir() + dir, err := os.MkdirTemp("", "test_concurrency") + require.NoError(t, err) + defer os.RemoveAll(dir) 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 index a7f43d8ee..a4cf5abd6 100644 --- a/tsdb/tsdbutil/dir_locker_testutil.go +++ b/tsdb/tsdbutil/dir_locker_testutil.go @@ -60,8 +60,12 @@ 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 := t.TempDir() - + tmpdir, err := os.MkdirTemp("", "test") + require.NoError(t, err) + t.Cleanup(func() { + require.NoError(t, os.RemoveAll(tmpdir)) + }) + // Test preconditions (file already exists + lockfile option) if c.fileAlreadyExists { tmpLocker, err := NewDirLocker(tmpdir, "tsdb", log.NewNopLogger(), nil) @@ -78,7 +82,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") } })