diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-26 22:43:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 22:43:38 +0100 |
| commit | 1710eca4e930f7ed3a2b060029c627c1a66a2349 (patch) | |
| tree | f6a1161387751d8a413c0ebe66ba253f4a91a1af /test | |
| parent | 6a46a87d08bd1e9ddda3dd3c9c30d21d2226a654 (diff) | |
| parent | 2fa78938a94e90e41755b68dd1af36f5b817ed55 (diff) | |
| download | podman-1710eca4e930f7ed3a2b060029c627c1a66a2349.tar.gz podman-1710eca4e930f7ed3a2b060029c627c1a66a2349.tar.bz2 podman-1710eca4e930f7ed3a2b060029c627c1a66a2349.zip | |
Merge pull request #5629 from baude/v2containerinspect
podmanv2 container inspect
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/common_test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 16b971e65..caa1683a2 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -15,6 +15,7 @@ import ( "time" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/rootless" . "github.com/containers/libpod/test/utils" @@ -320,7 +321,7 @@ func (s *PodmanSessionIntegration) InspectImageJSON() []inspect.ImageData { } // InspectContainer returns a container's inspect data in JSON format -func (p *PodmanTestIntegration) InspectContainer(name string) []libpod.InspectContainerData { +func (p *PodmanTestIntegration) InspectContainer(name string) []define.InspectContainerData { cmd := []string{"inspect", name} session := p.Podman(cmd) session.WaitWithDefaultTimeout() @@ -492,8 +493,8 @@ func (p *PodmanTestIntegration) PullImage(image string) error { // InspectContainerToJSON takes the session output of an inspect // container and returns json -func (s *PodmanSessionIntegration) InspectContainerToJSON() []libpod.InspectContainerData { - var i []libpod.InspectContainerData +func (s *PodmanSessionIntegration) InspectContainerToJSON() []define.InspectContainerData { + var i []define.InspectContainerData err := json.Unmarshal(s.Out.Contents(), &i) Expect(err).To(BeNil()) return i |