diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-27 17:22:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 17:22:48 +0200 |
| commit | a8c2b5dee4b746c2e83970603ff2645008d54b95 (patch) | |
| tree | 90a26ad83414e451a136cc542a9eb07ec5975173 /libpod | |
| parent | 92e1b661ff5fba140ba07dd2c956e5aede90e9b5 (diff) | |
| parent | 65b20bd521302020ff229d455c60102e15a41b8a (diff) | |
| download | podman-a8c2b5dee4b746c2e83970603ff2645008d54b95.tar.gz podman-a8c2b5dee4b746c2e83970603ff2645008d54b95.tar.bz2 podman-a8c2b5dee4b746c2e83970603ff2645008d54b95.zip | |
Merge pull request #4127 from nalind/reexec-use
Correct use of reexec.Init()
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/image/image.go | 4 | ||||
| -rw-r--r-- | libpod/image/image_test.go | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libpod/image/image.go b/libpod/image/image.go index 0be6eeeb9..855da8611 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -29,7 +29,6 @@ import ( "github.com/containers/libpod/pkg/registries" "github.com/containers/libpod/pkg/util" "github.com/containers/storage" - "github.com/containers/storage/pkg/reexec" "github.com/opencontainers/go-digest" imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" @@ -85,9 +84,6 @@ func NewImageRuntimeFromStore(store storage.Store) *Runtime { // NewImageRuntimeFromOptions creates an Image Runtime including the store given // store options func NewImageRuntimeFromOptions(options storage.StoreOptions) (*Runtime, error) { - if reexec.Init() { - return nil, errors.Errorf("unable to reexec") - } store, err := setStore(options) if err != nil { return nil, err diff --git a/libpod/image/image_test.go b/libpod/image/image_test.go index 5a6d095f6..ef39d09c3 100644 --- a/libpod/image/image_test.go +++ b/libpod/image/image_test.go @@ -11,6 +11,7 @@ import ( "github.com/containers/libpod/libpod/events" "github.com/containers/libpod/pkg/util" "github.com/containers/storage" + "github.com/containers/storage/pkg/reexec" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/assert" ) @@ -70,6 +71,13 @@ func makeLocalMatrix(b, bg *Image) ([]localImageTest, error) { } +func TestMain(m *testing.M) { + if reexec.Init() { + return + } + os.Exit(m.Run()) +} + // TestImage_NewFromLocal tests finding the image locally by various names, // tags, and aliases func TestImage_NewFromLocal(t *testing.T) { |