aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-08 14:45:24 +0200
committerGitHub <noreply@github.com>2019-06-08 14:45:24 +0200
commit39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8 (patch)
tree001ee1a2377c342c616f300831375c42ae58c63f /test
parentf6a2860b625a796bd9d6fd48e641b7f7fa50d28a (diff)
parent1be345bd9d82ac64d7ae3ceea41f72329f7bdebf (diff)
downloadpodman-39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8.tar.gz
podman-39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8.tar.bz2
podman-39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8.zip
Merge pull request #3180 from mheon/inspect_volumes
Begin to break up pkg/inspect
Diffstat (limited to 'test')
-rw-r--r--test/e2e/common_test.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 0a388dc42..9529346b4 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -11,6 +11,7 @@ import (
"strings"
"testing"
+ "github.com/containers/libpod/cmd/podman/shared"
"github.com/containers/libpod/libpod"
"github.com/containers/libpod/pkg/inspect"
"github.com/containers/libpod/pkg/rootless"
@@ -319,7 +320,7 @@ func (s *PodmanSessionIntegration) InspectImageJSON() []inspect.ImageData {
}
// InspectContainer returns a container's inspect data in JSON format
-func (p *PodmanTestIntegration) InspectContainer(name string) []inspect.ContainerData {
+func (p *PodmanTestIntegration) InspectContainer(name string) []shared.InspectContainer {
cmd := []string{"inspect", name}
session := p.Podman(cmd)
session.WaitWithDefaultTimeout()
@@ -466,8 +467,8 @@ func (p *PodmanTestIntegration) PullImage(image string) error {
// InspectContainerToJSON takes the session output of an inspect
// container and returns json
-func (s *PodmanSessionIntegration) InspectContainerToJSON() []inspect.ContainerData {
- var i []inspect.ContainerData
+func (s *PodmanSessionIntegration) InspectContainerToJSON() []shared.InspectContainer {
+ var i []shared.InspectContainer
err := json.Unmarshal(s.Out.Contents(), &i)
Expect(err).To(BeNil())
return i