diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-15 09:19:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-15 09:19:40 -0400 |
| commit | f4c3b718eb22a161a897a6ed55d10f3a07e31aa8 (patch) | |
| tree | bb453d40a50f8cef1ebfedc73e43e2c7fe7d3456 /libpod/image/image_test.go | |
| parent | e94e3fd2e829fd2cd38428aa9d9bf68b37bb8407 (diff) | |
| parent | 200cfa41a434b7143620c2c252b3eb7ab3ef92f9 (diff) | |
| download | podman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.tar.gz podman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.tar.bz2 podman-f4c3b718eb22a161a897a6ed55d10f3a07e31aa8.zip | |
Merge pull request #6557 from rhatdan/lint
Turn on More linters
Diffstat (limited to 'libpod/image/image_test.go')
| -rw-r--r-- | libpod/image/image_test.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libpod/image/image_test.go b/libpod/image/image_test.go index 3cd368cdc..74067853e 100644 --- a/libpod/image/image_test.go +++ b/libpod/image/image_test.go @@ -44,7 +44,7 @@ func cleanup(workdir string, ir *Runtime) { } } -func makeLocalMatrix(b, bg *Image) ([]localImageTest, error) { +func makeLocalMatrix(b, bg *Image) []localImageTest { var l []localImageTest // busybox busybox := localImageTest{ @@ -65,7 +65,7 @@ func makeLocalMatrix(b, bg *Image) ([]localImageTest, error) { busyboxGlibc.names = bbGlibcNames l = append(l, busybox, busyboxGlibc) - return l, nil + return l } @@ -100,9 +100,7 @@ func TestImage_NewFromLocal(t *testing.T) { bbglibc, err := ir.New(context.Background(), "docker.io/library/busybox:glibc", "", "", writer, nil, SigningOptions{}, nil, util.PullImageMissing) assert.NoError(t, err) - tm, err := makeLocalMatrix(bb, bbglibc) - assert.NoError(t, err) - + tm := makeLocalMatrix(bb, bbglibc) for _, image := range tm { // tag our images err = image.img.TagImage(image.taggedName) |