containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libpod/image: unit tests: defer cleanup 

Defer cleaning up the test artifacts as early as possible.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg 2021-03-24 10:54:42 +01:00
parent 6a4ff44ae1
commit 7fe40cd203
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/image/image_test.go
View File

@ -94,6 +94,8 @@ func TestImage_NewFromLocal(t *testing.T) {
// Need images to be present for this test // Need images to be present for this test
ir, err := NewImageRuntimeFromOptions(so) ir, err := NewImageRuntimeFromOptions(so)
assert.NoError(t, err) assert.NoError(t, err)
defer cleanup(workdir, ir)
ir.Eventer = events.NewNullEventer() ir.Eventer = events.NewNullEventer()
bb, err := ir.New(context.Background(), "docker.io/library/busybox:latest", "", "", writer, nil, SigningOptions{}, nil, util.PullImageMissing, nil) bb, err := ir.New(context.Background(), "docker.io/library/busybox:latest", "", "", writer, nil, SigningOptions{}, nil, util.PullImageMissing, nil)
assert.NoError(t, err) assert.NoError(t, err)
@ -111,9 +113,6 @@ func TestImage_NewFromLocal(t *testing.T) {
assert.Equal(t, newImage.ID(), image.img.ID()) assert.Equal(t, newImage.ID(), image.img.ID())
} }
} }
// Shutdown the runtime and remove the temporary storage
cleanup(workdir, ir)
} }
// TestImage_New tests pulling the image by various names, tags, and from // TestImage_New tests pulling the image by various names, tags, and from
@ -126,13 +125,14 @@ func TestImage_New(t *testing.T) {
var names []string var names []string
workdir, err := mkWorkDir() workdir, err := mkWorkDir()
assert.NoError(t, err) assert.NoError(t, err)
so := storage.StoreOptions{ so := storage.StoreOptions{
RunRoot: workdir, RunRoot: workdir,
GraphRoot: workdir, GraphRoot: workdir,
} }
ir, err := NewImageRuntimeFromOptions(so) ir, err := NewImageRuntimeFromOptions(so)
assert.NoError(t, err) assert.NoError(t, err)
defer cleanup(workdir, ir)
ir.Eventer = events.NewNullEventer() ir.Eventer = events.NewNullEventer()
// Build the list of pull names // Build the list of pull names
names = append(names, bbNames...) names = append(names, bbNames...)
@ -147,9 +147,6 @@ func TestImage_New(t *testing.T) {
err = newImage.Remove(context.Background(), false) err = newImage.Remove(context.Background(), false)
assert.NoError(t, err) assert.NoError(t, err)
} }
// Shutdown the runtime and remove the temporary storage
cleanup(workdir, ir)
} }
// TestImage_MatchRepoTag tests the various inputs we need to match // TestImage_MatchRepoTag tests the various inputs we need to match
@ -162,13 +159,14 @@ func TestImage_MatchRepoTag(t *testing.T) {
//Set up //Set up
workdir, err := mkWorkDir() workdir, err := mkWorkDir()
assert.NoError(t, err) assert.NoError(t, err)
so := storage.StoreOptions{ so := storage.StoreOptions{
RunRoot: workdir, RunRoot: workdir,
GraphRoot: workdir, GraphRoot: workdir,
} }
ir, err := NewImageRuntimeFromOptions(so) ir, err := NewImageRuntimeFromOptions(so)
require.NoError(t, err) require.NoError(t, err)
defer cleanup(workdir, ir)
ir.Eventer = events.NewNullEventer() ir.Eventer = events.NewNullEventer()
newImage, err := ir.New(context.Background(), "busybox", "", "", os.Stdout, nil, SigningOptions{}, nil, util.PullImageMissing, nil) newImage, err := ir.New(context.Background(), "busybox", "", "", os.Stdout, nil, SigningOptions{}, nil, util.PullImageMissing, nil)
require.NoError(t, err) require.NoError(t, err)
@ -195,8 +193,6 @@ func TestImage_MatchRepoTag(t *testing.T) {
repoTag, err = newImage.MatchRepoTag("foo:bar") repoTag, err = newImage.MatchRepoTag("foo:bar")
require.NoError(t, err) require.NoError(t, err)
assert.Equal(t, "localhost/foo:bar", repoTag) assert.Equal(t, "localhost/foo:bar", repoTag)
// Shutdown the runtime and remove the temporary storage
cleanup(workdir, ir)
} }
// TestImage_RepoDigests tests RepoDigest generation. // TestImage_RepoDigests tests RepoDigest generation.