github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

test: use T.TempDir to create temporary test directory

Browse Source 
The directory created by `T.TempDir` is automatically removed when the
test and all its subtests complete.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun
2022-03-15 11:41:08 +08:00
parent ed4cc4b482
commit 18ec2761c0
40 changed files with 137 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
snapshots/storage/metastore_bench_test.go
View File

@@ -19,7 +19,6 @@ package storage
import (
"context"
"fmt"
"os"
"testing"
"github.com/containerd/containerd/snapshots"
@@ -42,17 +41,16 @@ func Benchmarks(b *testing.B, name string, metaFn metaFactory) {
func makeBench(b *testing.B, name string, metaFn metaFactory, fn func(context.Context, *testing.B, *MetaStore)) func(b *testing.B) {
return func(b *testing.B) {
ctx := context.Background()
tmpDir, err := os.MkdirTemp("", "metastore-bench-"+name+"-")
if err != nil {
b.Fatal(err)
}
defer os.RemoveAll(tmpDir)
ms, err := metaFn(tmpDir)
ms, err := metaFn(b.TempDir())
if err != nil {
b.Fatal(err)
}
b.Cleanup(func() {
ms.Close()
})
ctx, t, err := ms.TransactionContext(ctx, true)
if err != nil {
b.Fatal(err)
@@ -67,13 +65,8 @@ func makeBench(b *testing.B, name string, metaFn metaFactory, fn func(context.Co
func openCloseWritable(b *testing.B, name string, metaFn metaFactory) func(b *testing.B) {
return func(b *testing.B) {
ctx := context.Background()
tmpDir, err := os.MkdirTemp("", "metastore-bench-"+name+"-")
if err != nil {
b.Fatal(err)
}
defer os.RemoveAll(tmpDir)
ms, err := metaFn(tmpDir)
ms, err := metaFn(b.TempDir())
if err != nil {
b.Fatal(err)
}
@@ -95,13 +88,8 @@ func openCloseWritable(b *testing.B, name string, metaFn metaFactory) func(b *te
func openCloseReadonly(b *testing.B, name string, metaFn metaFactory) func(b *testing.B) {
return func(b *testing.B) {
ctx := context.Background()
tmpDir, err := os.MkdirTemp("", "metastore-bench-"+name+"-")
if err != nil {
b.Fatal(err)
}
defer os.RemoveAll(tmpDir)
ms, err := metaFn(tmpDir)
ms, err := metaFn(b.TempDir())
if err != nil {
b.Fatal(err)
}

12
snapshots/storage/metastore_test.go
View File

@@ -20,7 +20,6 @@ import (
"context"
"errors"
"fmt"
"os"
"testing"
"time"
@@ -66,17 +65,16 @@ func MetaStoreSuite(t *testing.T, name string, meta func(root string) (*MetaStor
func makeTest(t *testing.T, name string, metaFn metaFactory, fn testFunc) func(t *testing.T) {
return func(t *testing.T) {
ctx := context.Background()
tmpDir, err := os.MkdirTemp("", "metastore-test-"+name+"-")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpDir)
ms, err := metaFn(tmpDir)
ms, err := metaFn(t.TempDir())
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() {
ms.Close()
})
fn(ctx, t, ms)
}
}