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

6
mount/fmountat_linux_test.go
View File

@@ -45,11 +45,7 @@ func makeTestForFMountat(fn fMountatCaseFunc) func(t *testing.T) {
return func(t *testing.T) {
t.Parallel()
suiteDir, err := os.MkdirTemp("", "fmountat-test-")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(suiteDir)
suiteDir := t.TempDir()
fn(t, suiteDir)
}

33
mount/lookup_linux_test.go
View File

@@ -41,11 +41,7 @@ func checkLookup(t *testing.T, fsType, mntPoint, dir string) {
func testLookup(t *testing.T, fsType string) {
testutil.RequiresRoot(t)
mnt, err := os.MkdirTemp("", "containerd-mountinfo-test-lookup")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(mnt)
mnt := t.TempDir()
loop, err := loopback.New(100 << 20) // 100 MB
if err != nil {
@@ -68,11 +64,7 @@ func testLookup(t *testing.T, fsType string) {
assert.Check(t, strings.HasPrefix(loop.Device, "/dev/loop"))
checkLookup(t, fsType, mnt, mnt)
newMnt, err := os.MkdirTemp("", "containerd-mountinfo-test-newMnt")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(newMnt)
newMnt := t.TempDir()
if out, err := exec.Command("mount", "--bind", mnt, newMnt).CombinedOutput(); err != nil {
t.Fatalf("could not mount %s to %s: %v (out: %q)", mnt, newMnt, err, string(out))
@@ -99,21 +91,10 @@ func TestLookupWithXFS(t *testing.T) {
}
func TestLookupWithOverlay(t *testing.T) {
lower, err := os.MkdirTemp("", "containerd-mountinfo-test-lower")
assert.NilError(t, err)
defer os.RemoveAll(lower)
upper, err := os.MkdirTemp("", "containerd-mountinfo-test-upper")
assert.NilError(t, err)
defer os.RemoveAll(upper)
work, err := os.MkdirTemp("", "containerd-mountinfo-test-work")
assert.NilError(t, err)
defer os.RemoveAll(work)
overlay, err := os.MkdirTemp("", "containerd-mountinfo-test-overlay")
assert.NilError(t, err)
defer os.RemoveAll(overlay)
lower := t.TempDir()
upper := t.TempDir()
work := t.TempDir()
overlay := t.TempDir()
if out, err := exec.Command("mount", "-t", "overlay", "overlay", "-o", fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s",
lower, upper, work), overlay).CombinedOutput(); err != nil {
@@ -123,7 +104,7 @@ func TestLookupWithOverlay(t *testing.T) {
defer testutil.Unmount(t, overlay)
testdir := filepath.Join(overlay, "testdir")
err = os.Mkdir(testdir, 0777)
err := os.Mkdir(testdir, 0777)
assert.NilError(t, err)
testfile := filepath.Join(overlay, "testfile")

10
mount/mount_linux_test.go
View File

@@ -104,15 +104,7 @@ func TestFUSEHelper(t *testing.T) {
if err != nil {
t.Skip("fuse-overlayfs not installed")
}
td, err := os.MkdirTemp("", "fuse")
if err != nil {
t.Fatal(err)
}
defer func() {
if err := os.RemoveAll(td); err != nil {
t.Fatal(err)
}
}()
td := t.TempDir()
for _, dir := range []string{"lower1", "lower2", "upper", "work", "merged"} {
if err := os.Mkdir(filepath.Join(td, dir), 0755); err != nil {