Skip to content

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

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

Merged
imjasonh merged 1 commit into from
Jan 3, 2023
Merged

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

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions pkg/authn/keychain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@ func TestMain(m *testing.M) {
func setupConfigDir(t *testing.T) string {
tmpdir := os.Getenv("TEST_TMPDIR")
if tmpdir == "" {
var err error
tmpdir, err = os.MkdirTemp("", "keychain_test")
if err != nil {
t.Fatalf("creating temp dir: %v", err)
}
tmpdir = t.TempDir()
}

fresh++
Expand Down Expand Up @@ -98,11 +94,7 @@ func TestNoConfig(t *testing.T) {
func TestPodmanConfig(t *testing.T) {
tmpdir := os.Getenv("TEST_TMPDIR")
if tmpdir == "" {
var err error
tmpdir, err = os.MkdirTemp("", "keychain_test")
if err != nil {
t.Fatalf("creating temp dir: %v", err)
}
tmpdir = t.TempDir()
}
fresh++
p := filepath.Join(tmpdir, fmt.Sprintf("%d", fresh))
Expand Down
6 changes: 1 addition & 5 deletions pkg/crane/crane_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,7 @@ func TestCraneSaveLegacy(t *testing.T) {
func TestCraneSaveOCI(t *testing.T) {
t.Parallel()
// Write an image as an OCI image layout.
tmp, err := os.MkdirTemp("", "")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmp)
tmp := t.TempDir()

img, err := random.Image(1024, 5)
if err != nil {
Expand Down
18 changes: 3 additions & 15 deletions pkg/v1/cache/fs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,7 @@ import (
)

func TestFilesystemCache(t *testing.T) {
dir, err := os.MkdirTemp("", "ggcr-cache")
if err != nil {
t.Fatalf("TempDir: %v", err)
}
defer os.RemoveAll(dir)
dir := t.TempDir()

numLayers := 5
img, err := random.Image(10, int64(numLayers))
Expand Down Expand Up @@ -155,11 +151,7 @@ func TestFilesystemCache(t *testing.T) {
}

func TestErrNotFound(t *testing.T) {
dir, err := os.MkdirTemp("", "ggcr-cache")
if err != nil {
t.Fatalf("TempDir: %v", err)
}
os.RemoveAll(dir) // Remove the tempdir.
dir := t.TempDir()

c := NewFilesystemCache(dir)
h := v1.Hash{Algorithm: "fake", Hex: "not-found"}
Expand All @@ -172,11 +164,7 @@ func TestErrNotFound(t *testing.T) {
}

func TestErrUnexpectedEOF(t *testing.T) {
dir, err := os.MkdirTemp("", "ggcr-cache")
if err != nil {
t.Fatalf("TempDir: %v", err)
}
defer os.RemoveAll(dir) // Remove the tempdir.
dir := t.TempDir()

// create a random layer
l, err := random.Layer(10, types.DockerLayer)
Expand Down
75 changes: 11 additions & 64 deletions pkg/v1/layout/write_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@ import (
)

func TestWrite(t *testing.T) {
tmp, err := os.MkdirTemp("", "write-index-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

original, err := ImageIndexFromPath(testPath)
if err != nil {
Expand Down Expand Up @@ -78,12 +73,7 @@ func TestWriteErrors(t *testing.T) {
}

func TestAppendDescriptorInitializesIndex(t *testing.T) {
tmp, err := os.MkdirTemp("", "write-index-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()
temp, err := Write(tmp, empty.Index)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -115,12 +105,7 @@ func TestAppendDescriptorInitializesIndex(t *testing.T) {
}

func TestRoundtrip(t *testing.T) {
tmp, err := os.MkdirTemp("", "write-index-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

original, err := ImageIndexFromPath(testPath)
if err != nil {
Expand Down Expand Up @@ -150,10 +135,7 @@ func TestRoundtrip(t *testing.T) {
}

func TestOptions(t *testing.T) {
tmp, err := os.MkdirTemp("", "write-index-test")
if err != nil {
t.Fatal(err)
}
tmp := t.TempDir()
temp, err := Write(tmp, empty.Index)
if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -229,12 +211,7 @@ func TestDeduplicatedWrites(t *testing.T) {

func TestRemoveDescriptor(t *testing.T) {
// need to set up a basic path
tmp, err := os.MkdirTemp("", "remove-descriptor-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

var ii v1.ImageIndex
ii = empty.Index
Expand Down Expand Up @@ -290,12 +267,7 @@ func TestRemoveDescriptor(t *testing.T) {

func TestReplaceIndex(t *testing.T) {
// need to set up a basic path
tmp, err := os.MkdirTemp("", "replace-index-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

var ii v1.ImageIndex
ii = empty.Index
Expand Down Expand Up @@ -365,12 +337,7 @@ func TestReplaceIndex(t *testing.T) {

func TestReplaceImage(t *testing.T) {
// need to set up a basic path
tmp, err := os.MkdirTemp("", "replace-image-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

var ii v1.ImageIndex
ii = empty.Index
Expand Down Expand Up @@ -440,12 +407,7 @@ func TestReplaceImage(t *testing.T) {

func TestRemoveBlob(t *testing.T) {
// need to set up a basic path
tmp, err := os.MkdirTemp("", "remove-blob-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

var ii v1.ImageIndex = empty.Index
l, err := Write(tmp, ii)
Expand Down Expand Up @@ -483,12 +445,7 @@ func TestRemoveBlob(t *testing.T) {

func TestStreamingWriteLayer(t *testing.T) {
// need to set up a basic path
tmp, err := os.MkdirTemp("", "streaming-write-layer-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

var ii v1.ImageIndex = empty.Index
l, err := Write(tmp, ii)
Expand Down Expand Up @@ -546,12 +503,7 @@ func TestStreamingWriteLayer(t *testing.T) {

func TestOverwriteWithWriteLayer(t *testing.T) {
// need to set up a basic path
tmp, err := os.MkdirTemp("", "overwrite-with-write-layer-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

var ii v1.ImageIndex = empty.Index
l, err := Write(tmp, ii)
Expand Down Expand Up @@ -642,12 +594,7 @@ func TestOverwriteWithWriteLayer(t *testing.T) {

func TestOverwriteWithReplaceImage(t *testing.T) {
// need to set up a basic path
tmp, err := os.MkdirTemp("", "overwrite-with-replace-image-test")
if err != nil {
t.Fatal(err)
}

defer os.RemoveAll(tmp)
tmp := t.TempDir()

var ii v1.ImageIndex = empty.Index
l, err := Write(tmp, ii)
Expand Down