From 9602933db265ef71676b2ab7ddcadf7f8985e6f1 Mon Sep 17 00:00:00 2001 From: Li Zhijian Date: Fri, 15 Jan 2021 16:19:57 +0800 Subject: [PATCH] Cleanup tempfiles in tests (#8179) * test: cleanup tempdir for TestBlockWriter Signed-off-by: Li Zhijian * test: cleanup tempdir for TestLogPartialWrite Signed-off-by: Li Zhijian --- tsdb/blockwriter_test.go | 2 ++ tsdb/wal/wal_test.go | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tsdb/blockwriter_test.go b/tsdb/blockwriter_test.go index bc038e7ac..8f1dab73d 100644 --- a/tsdb/blockwriter_test.go +++ b/tsdb/blockwriter_test.go @@ -32,6 +32,7 @@ func TestBlockWriter(t *testing.T) { ctx := context.Background() outputDir, err := ioutil.TempDir(os.TempDir(), "output") require.NoError(t, err) + defer func() { require.NoError(t, os.RemoveAll(outputDir)) }() w, err := NewBlockWriter(log.NewNopLogger(), outputDir, DefaultBlockDuration) require.NoError(t, err) @@ -55,6 +56,7 @@ func TestBlockWriter(t *testing.T) { blockpath := filepath.Join(outputDir, id.String()) b, err := OpenBlock(nil, blockpath, nil) require.NoError(t, err) + defer func() { require.NoError(t, b.Close()) }() q, err := NewBlockQuerier(b, math.MinInt64, math.MaxInt64) require.NoError(t, err) series := query(t, q, labels.MustNewMatcher(labels.MatchRegexp, "", ".*")) diff --git a/tsdb/wal/wal_test.go b/tsdb/wal/wal_test.go index 24d909801..b12c0d60c 100644 --- a/tsdb/wal/wal_test.go +++ b/tsdb/wal/wal_test.go @@ -454,8 +454,9 @@ func TestLogPartialWrite(t *testing.T) { for testName, testData := range tests { t.Run(testName, func(t *testing.T) { - dirPath, err := ioutil.TempDir("", "") + dirPath, err := ioutil.TempDir("", "logpartialwrite") require.NoError(t, err) + defer func() { require.NoError(t, os.RemoveAll(dirPath)) }() w, err := NewSize(nil, nil, dirPath, segmentSize, false) require.NoError(t, err) @@ -480,6 +481,7 @@ func TestLogPartialWrite(t *testing.T) { // Read it back. We expect no corruption. s, err := OpenReadSegment(SegmentName(dirPath, 0)) require.NoError(t, err) + defer func() { require.NoError(t, s.Close()) }() r := NewReader(NewSegmentBufReader(s)) for i := 0; i < testData.numRecords; i++ { -- GitLab