Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: use T.TempDir to create temporary test directory #5660

Merged
merged 1 commit into from
May 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions cdc/owner/changefeed_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package owner
import (
"context"
"encoding/json"
"io/ioutil"
"math"
"os"
"path/filepath"
Expand Down Expand Up @@ -479,9 +478,7 @@ func TestRemoveChangefeed(t *testing.T) {
baseCtx, cancel := context.WithCancel(context.Background())
ctx := cdcContext.NewContext4Test(baseCtx, true)
info := ctx.ChangefeedVars().Info
dir, err := ioutil.TempDir("", "remove-changefeed-test")
require.NoError(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()
info.Config.Consistent = &config.ConsistentConfig{
Level: "eventual",
Storage: filepath.Join("nfs://", dir),
Expand All @@ -498,9 +495,7 @@ func TestRemovePausedChangefeed(t *testing.T) {
ctx := cdcContext.NewContext4Test(baseCtx, true)
info := ctx.ChangefeedVars().Info
info.State = model.StateStopped
dir, err := ioutil.TempDir("", "remove-paused-changefeed-test")
require.NoError(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()
info.Config.Consistent = &config.ConsistentConfig{
Level: "eventual",
Storage: filepath.Join("nfs://", dir),
Expand Down
17 changes: 4 additions & 13 deletions cdc/redo/reader/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"bufio"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"testing"
Expand All @@ -40,17 +39,13 @@ func TestReaderNewReader(t *testing.T) {
_, err := newReader(context.Background(), nil)
require.NotNil(t, err)

dir, err := ioutil.TempDir("", "redo-newReader")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()
_, err = newReader(context.Background(), &readerConfig{dir: dir})
require.Nil(t, err)
}

func TestReaderRead(t *testing.T) {
dir, err := ioutil.TempDir("", "redo-reader")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

cfg := &writer.FileWriterConfig{
MaxLogSize: 100000,
Expand Down Expand Up @@ -104,9 +99,7 @@ func TestReaderRead(t *testing.T) {
}

func TestReaderOpenSelectedFiles(t *testing.T) {
dir, err := ioutil.TempDir("", "redo-openSelectedFiles")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -158,9 +151,7 @@ func TestReaderOpenSelectedFiles(t *testing.T) {
f1, err := os.Create(path)
require.Nil(t, err)

dir1, err := ioutil.TempDir("", "redo-openSelectedFiles1")
require.Nil(t, err)
defer os.RemoveAll(dir1) //nolint:errcheck
dir1 := t.TempDir()
fileName = fmt.Sprintf(common.RedoLogFileFormatV2, "cp", "default", "test-cf",
common.DefaultDDLLogFileType, 11, uuidGen.NewString(), common.LogEXT+"test")
path = filepath.Join(dir1, fileName)
Expand Down
17 changes: 4 additions & 13 deletions cdc/redo/reader/reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"context"
"fmt"
"io"
"io/ioutil"
"net/url"
"os"
"path/filepath"
Expand All @@ -44,9 +43,7 @@ func TestNewLogReader(t *testing.T) {
_, err = NewLogReader(context.Background(), &LogReaderConfig{})
require.Nil(t, err)

dir, err := ioutil.TempDir("", "redo-NewLogReader")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

s3URI, err := url.Parse("s3://logbucket/test-changefeed?endpoint=http://111/")
require.Nil(t, err)
Expand Down Expand Up @@ -75,9 +72,7 @@ func TestNewLogReader(t *testing.T) {
}

func TestLogReaderResetReader(t *testing.T) {
dir, err := ioutil.TempDir("", "redo-ResetReader")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

ctx, cancel := context.WithCancel(context.Background())
defer cancel()
Expand Down Expand Up @@ -237,9 +232,7 @@ func TestLogReaderResetReader(t *testing.T) {
}

func TestLogReaderReadMeta(t *testing.T) {
dir, err := ioutil.TempDir("", "redo-ReadMeta")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

fileName := fmt.Sprintf("%s_%s_%d_%s%s", "cp",
"test-changefeed",
Expand Down Expand Up @@ -271,9 +264,7 @@ func TestLogReaderReadMeta(t *testing.T) {
_, err = f.Write(data)
require.Nil(t, err)

dir1, err := ioutil.TempDir("", "redo-NoReadMeta")
require.Nil(t, err)
defer os.RemoveAll(dir1)
dir1 := t.TempDir()

tests := []struct {
name string
Expand Down
16 changes: 5 additions & 11 deletions cdc/redo/writer/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ func TestMain(m *testing.M) {
}

func TestWriterWrite(t *testing.T) {
dir, err := ioutil.TempDir("", "redo-writer")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

cfs := []model.ChangeFeedID{
model.DefaultChangeFeedID("test-cf"),
Expand Down Expand Up @@ -88,7 +86,7 @@ func TestWriterWrite(t *testing.T) {
}

w.eventCommitTS.Store(1)
_, err = w.Write([]byte("tes1t11111"))
_, err := w.Write([]byte("tes1t11111"))
require.Nil(t, err)
var fileName string
// create a .tmp file
Expand Down Expand Up @@ -207,9 +205,7 @@ func TestWriterWrite(t *testing.T) {
}

func TestWriterGC(t *testing.T) {
dir, err := ioutil.TempDir("", "redo-GC")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

uuidGen := uuid.NewConstGenerator("const-uuid")
controller := gomock.NewController(t)
Expand Down Expand Up @@ -265,7 +261,7 @@ func TestWriterGC(t *testing.T) {
}
w.running.Store(true)
w.eventCommitTS.Store(1)
_, err = w.Write([]byte("t1111"))
_, err := w.Write([]byte("t1111"))
require.Nil(t, err)
w.eventCommitTS.Store(2)
_, err = w.Write([]byte("t2222"))
Expand Down Expand Up @@ -318,9 +314,7 @@ func TestNewWriter(t *testing.T) {
s3URI, err := url.Parse("s3://logbucket/test-changefeed?endpoint=http://111/")
require.Nil(t, err)

dir, err := ioutil.TempDir("", "redo-NewWriter")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

uuidGen := uuid.NewConstGenerator("const-uuid")
w, err := NewWriter(context.Background(), &FileWriterConfig{
Expand Down
27 changes: 7 additions & 20 deletions cdc/redo/writer/writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package writer
import (
"context"
"fmt"
"io/ioutil"
"math"
"net/url"
"os"
Expand Down Expand Up @@ -303,9 +302,7 @@ func TestLogWriterFlushLog(t *testing.T) {
},
}

dir, err := ioutil.TempDir("", "redo-FlushLog")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

for _, tt := range tests {
controller := gomock.NewController(t)
Expand Down Expand Up @@ -394,9 +391,7 @@ func TestLogWriterEmitCheckpointTs(t *testing.T) {
},
}

dir, err := ioutil.TempDir("", "redo-EmitCheckpointTs")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

for _, tt := range tests {
controller := gomock.NewController(t)
Expand Down Expand Up @@ -486,9 +481,7 @@ func TestLogWriterEmitResolvedTs(t *testing.T) {
},
}

dir, err := ioutil.TempDir("", "redo-ResolvedTs")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

for _, tt := range tests {
controller := gomock.NewController(t)
Expand Down Expand Up @@ -568,9 +561,7 @@ func TestLogWriterGetCurrentResolvedTs(t *testing.T) {
},
}

dir, err := ioutil.TempDir("", "redo-GetCurrentResolvedTs")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()

for _, tt := range tests {
mockWriter := &mockFileWriter{}
Expand Down Expand Up @@ -654,9 +645,7 @@ func TestNewLogWriter(t *testing.T) {
require.Nil(t, err)
require.NotSame(t, ll, ll2)

dir, err := ioutil.TempDir("", "redo-NewLogWriter")
require.Nil(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()
fileName := fmt.Sprintf("%s_%s_%d_%s%s", "cp", "test-changefeed", time.Now().Unix(), common.DefaultMetaFileType, common.MetaEXT)
path := filepath.Join(dir, fileName)
f, err := os.Create(path)
Expand Down Expand Up @@ -832,10 +821,9 @@ func TestDeleteAllLogs(t *testing.T) {
}

for _, tt := range tests {
dir, err := ioutil.TempDir("", "redo-DeleteAllLogs")
require.Nil(t, err)
dir := t.TempDir()
path := filepath.Join(dir, fileName)
_, err = os.Create(path)
_, err := os.Create(path)
require.Nil(t, err)
path = filepath.Join(dir, fileName1)
_, err = os.Create(path)
Expand Down Expand Up @@ -884,7 +872,6 @@ func TestDeleteAllLogs(t *testing.T) {
require.True(t, os.IsNotExist(err), tt.name)
}
}
os.RemoveAll(dir)
getAllFilesInS3 = origin
}
}
Expand Down
1 change: 0 additions & 1 deletion dm/pkg/storage/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,6 @@ func TestCollectDirFilesAndRemove(t *testing.T) {

// test local
localDir := t.TempDir()
defer os.RemoveAll(localDir)
for _, fileName := range fileNames {
f, err := os.Create(path.Join(localDir, fileName))
require.NoError(t, err)
Expand Down
6 changes: 2 additions & 4 deletions dm/relay/meta_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ type MetaTestCase struct {
}

func (r *testMetaSuite) TestLocalMeta(c *C) {
dir, err := os.MkdirTemp("", "test_local_meta")
c.Assert(err, IsNil)
defer os.RemoveAll(dir)
dir := c.MkDir()

gset0, _ := gtid.ParserGTID("mysql", "")
gset1, _ := gtid.ParserGTID("mysql", "85ab69d1-b21f-11e6-9c5e-64006a8978d2:1-12")
Expand Down Expand Up @@ -77,7 +75,7 @@ func (r *testMetaSuite) TestLocalMeta(c *C) {

// load, but empty
lm := NewLocalMeta("mysql", dir)
err = lm.Load()
err := lm.Load()
c.Assert(err, IsNil)

uuid, pos := lm.Pos()
Expand Down
8 changes: 2 additions & 6 deletions dm/relay/purger_helper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ func (t *testPurgerSuite) TestPurgeRelayFilesBeforeFile(c *C) {
c.Assert(files, IsNil)

// create relay log dir
baseDir, err := os.MkdirTemp("", "test_get_relay_files_before_file")
c.Assert(err, IsNil)
defer os.RemoveAll(baseDir)
baseDir := c.MkDir()
// empty relay log dirs
safeRelay = &streamer.RelayLogInfo{
SubDir: t.uuids[len(t.uuids)-1],
Expand Down Expand Up @@ -120,9 +118,7 @@ func (t *testPurgerSuite) TestPurgeRelayFilesBeforeFile(c *C) {

func (t *testPurgerSuite) TestPurgeRelayFilesBeforeFileAndTime(c *C) {
// create relay log dir
baseDir, err := os.MkdirTemp("", "test_get_relay_files_before_file_and_time")
c.Assert(err, IsNil)
defer os.RemoveAll(baseDir)
baseDir := c.MkDir()

// empty relay log dirs
safeRelay := &streamer.RelayLogInfo{
Expand Down
Loading