diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-18 09:23:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 09:23:47 +0200 |
| commit | 7488ed6d9a619d86333dc1880d4df034fbb371b9 (patch) | |
| tree | 369e340cfc6ae08b62555a9fe1e4db4d0deae5eb /test | |
| parent | b2734baee5637ec4440a40cca8ff5ebab377739f (diff) | |
| parent | c91bc31570f1fab616e10d0e2b4a6c8b7fe631c7 (diff) | |
| download | podman-7488ed6d9a619d86333dc1880d4df034fbb371b9.tar.gz podman-7488ed6d9a619d86333dc1880d4df034fbb371b9.tar.bz2 podman-7488ed6d9a619d86333dc1880d4df034fbb371b9.zip | |
Merge pull request #3522 from mheon/nix_the_artifact
Move the HostConfig portion of Inspect inside libpod
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/common_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index abaf2cccf..ef1c85518 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -12,7 +12,6 @@ import ( "testing" "time" - "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/rootless" @@ -322,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) []shared.InspectContainer { +func (p *PodmanTestIntegration) InspectContainer(name string) []libpod.InspectContainerData { cmd := []string{"inspect", name} session := p.Podman(cmd) session.WaitWithDefaultTimeout() @@ -481,8 +480,8 @@ func (p *PodmanTestIntegration) PullImage(image string) error { // InspectContainerToJSON takes the session output of an inspect // container and returns json -func (s *PodmanSessionIntegration) InspectContainerToJSON() []shared.InspectContainer { - var i []shared.InspectContainer +func (s *PodmanSessionIntegration) InspectContainerToJSON() []libpod.InspectContainerData { + var i []libpod.InspectContainerData err := json.Unmarshal(s.Out.Contents(), &i) Expect(err).To(BeNil()) return i |