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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Aug 30, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 6 additions & 16 deletions drivers/copy/copy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,10 @@ func TestCopyWithoutRange(t *testing.T) {
}

func TestCopyDir(t *testing.T) {
srcDir, err := ioutil.TempDir("", "srcDir")
assert.NilError(t, err)
srcDir := t.TempDir()
populateSrcDir(t, srcDir, 3)

dstDir, err := ioutil.TempDir("", "testdst")
assert.NilError(t, err)
defer os.RemoveAll(dstDir)
dstDir := t.TempDir()

assert.Check(t, DirCopy(srcDir, dstDir, Content, false))
assert.NilError(t, filepath.Walk(srcDir, func(srcPath string, f os.FileInfo, err error) error {
Expand Down Expand Up @@ -110,15 +107,13 @@ func populateSrcDir(t *testing.T, srcDir string, remainingDepth int) {
}

func doCopyTest(t *testing.T, copyWithFileRange, copyWithFileClone *bool) {
dir, err := ioutil.TempDir("", "storage-copy-check")
assert.NilError(t, err)
defer os.RemoveAll(dir)
dir := t.TempDir()
srcFilename := filepath.Join(dir, "srcFilename")
dstFilename := filepath.Join(dir, "dstilename")

r := rand.New(rand.NewSource(0))
buf := make([]byte, 1024)
_, err = r.Read(buf)
_, err := r.Read(buf)
assert.NilError(t, err)
assert.NilError(t, ioutil.WriteFile(srcFilename, buf, 0777))
fileinfo, err := os.Stat(srcFilename)
Expand All @@ -133,13 +128,8 @@ func doCopyTest(t *testing.T, copyWithFileRange, copyWithFileClone *bool) {
func TestCopyHardlink(t *testing.T) {
var srcFile1FileInfo, srcFile2FileInfo, dstFile1FileInfo, dstFile2FileInfo unix.Stat_t

srcDir, err := ioutil.TempDir("", "srcDir")
assert.NilError(t, err)
defer os.RemoveAll(srcDir)

dstDir, err := ioutil.TempDir("", "dstDir")
assert.NilError(t, err)
defer os.RemoveAll(dstDir)
srcDir := t.TempDir()
dstDir := t.TempDir()

srcFile1 := filepath.Join(srcDir, "file1")
srcFile2 := filepath.Join(srcDir, "file2")
Expand Down
9 changes: 2 additions & 7 deletions drivers/overlay/overlay_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
//go:build linux
// +build linux

package overlay

import (
"io/ioutil"
"os"
"testing"

graphdriver "github.com/containers/storage/drivers"
Expand All @@ -25,11 +24,7 @@ func init() {
}

func skipIfNaive(t *testing.T) {
td, err := ioutil.TempDir("", "naive-check-")
if err != nil {
t.Fatalf("Failed to create temp dir: %v", err)
}
defer os.RemoveAll(td)
td := t.TempDir()

if err := doesSupportNativeDiff(td, ""); err != nil {
t.Skipf("Cannot run test with naive diff")
Expand Down
5 changes: 1 addition & 4 deletions images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package storage

import (
"io/ioutil"
"testing"
"time"

Expand All @@ -10,9 +9,7 @@ import (
)

func newTestImageStore(t *testing.T) ImageStore {
dir, err := ioutil.TempDir("", "storage")
require.Nil(t, err)
store, err := newImageStore(dir)
store, err := newImageStore(t.TempDir())
require.Nil(t, err)
return store
}
Expand Down
37 changes: 10 additions & 27 deletions pkg/archive/archive_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import (
// ├── d2 # opaque, 0750
// │   └── f1 # empty file, 0660
// └── d3 # 0700
// └── f1 # whiteout, 0000
//
// └── f1 # whiteout, 0000
func setupOverlayTestDir(t *testing.T, src string) {
// Create opaque directory containing single file and permission 0700
err := os.Mkdir(filepath.Join(src, "d1"), 0700)
Expand Down Expand Up @@ -98,21 +99,13 @@ func TestOverlayTarUntar(t *testing.T) {
require.NoError(t, err)
defer system.Umask(oldmask)

src, err := ioutil.TempDir("", "storage-test-overlay-tar-src")
require.NoError(t, err)
defer os.RemoveAll(src)

src := t.TempDir()
setupOverlayTestDir(t, src)

lower, err := ioutil.TempDir("", "storage-test-overlay-tar-lower")
require.NoError(t, err)
defer os.RemoveAll(lower)

lower := t.TempDir()
setupOverlayLowerDir(t, lower)

dst, err := ioutil.TempDir("", "storage-test-overlay-tar-dst")
require.NoError(t, err)
defer os.RemoveAll(dst)
dst := t.TempDir()

options := &TarOptions{
Compression: Uncompressed,
Expand Down Expand Up @@ -144,21 +137,13 @@ func TestOverlayTarAUFSUntar(t *testing.T) {
require.NoError(t, err)
defer system.Umask(oldmask)

src, err := ioutil.TempDir("", "storage-test-overlay-tar-src")
require.NoError(t, err)
defer os.RemoveAll(src)

src := t.TempDir()
setupOverlayTestDir(t, src)

lower, err := ioutil.TempDir("", "storage-test-overlay-tar-lower")
require.NoError(t, err)
defer os.RemoveAll(lower)

lower := t.TempDir()
setupOverlayLowerDir(t, lower)

dst, err := ioutil.TempDir("", "storage-test-overlay-tar-dst")
require.NoError(t, err)
defer os.RemoveAll(dst)
dst := t.TempDir()

archive, err := TarWithOptions(src, &TarOptions{
Compression: Uncompressed,
Expand Down Expand Up @@ -205,11 +190,9 @@ func TestNestedOverlayWhiteouts(t *testing.T) {
require.NoError(t, tw.Close())
}()

dst, err := ioutil.TempDir("", "storage-test-overlay-tar-dst")
require.NoError(t, err)
defer os.RemoveAll(dst)
dst := t.TempDir()

err = Untar(reader, dst, &TarOptions{
err := Untar(reader, dst, &TarOptions{
Compression: Uncompressed,
WhiteoutFormat: OverlayWhiteoutFormat,
})
Expand Down