summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSujil02 <sushah@redhat.com>2020-04-26 16:23:42 -0400
committerSujil02 <sushah@redhat.com>2020-04-26 16:38:52 -0400
commitc1766d5e6496d48d357907598a44e147642a877e (patch)
tree150eb4f0eb9e06a41ae265e29646a733c92b9f2b /test
parent13c1d2c6af211ade30eeb01d02af7fbf94f2582d (diff)
downloadpodman-c1766d5e6496d48d357907598a44e147642a877e.tar.gz
podman-c1766d5e6496d48d357907598a44e147642a877e.tar.bz2
podman-c1766d5e6496d48d357907598a44e147642a877e.zip
Enable pod inspect integration test
Enable pod inspect integration test Get rid of libpod pod inspect references Remove libpod PodInspect struct. Signed-off-by: Sujil02 <sushah@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/e2e/common_test.go5
-rw-r--r--test/e2e/pod_inspect_test.go6
2 files changed, 4 insertions, 7 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index d93ee8d3a..160af1bd5 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -14,7 +14,6 @@ import (
"testing"
"time"
- "github.com/containers/libpod/libpod"
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/inspect"
"github.com/containers/libpod/pkg/rootless"
@@ -501,8 +500,8 @@ func (s *PodmanSessionIntegration) InspectContainerToJSON() []define.InspectCont
}
// InspectPodToJSON takes the sessions output from a pod inspect and returns json
-func (s *PodmanSessionIntegration) InspectPodToJSON() libpod.PodInspect {
- var i libpod.PodInspect
+func (s *PodmanSessionIntegration) InspectPodToJSON() define.InspectPodData {
+ var i define.InspectPodData
err := json.Unmarshal(s.Out.Contents(), &i)
Expect(err).To(BeNil())
return i
diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go
index 06f36c751..f87bbe047 100644
--- a/test/e2e/pod_inspect_test.go
+++ b/test/e2e/pod_inspect_test.go
@@ -16,7 +16,6 @@ var _ = Describe("Podman pod inspect", func() {
)
BeforeEach(func() {
- Skip(v2fail)
tempdir, err = CreateTempDirInTempDir()
if err != nil {
os.Exit(1)
@@ -55,8 +54,7 @@ var _ = Describe("Podman pod inspect", func() {
inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(Equal(0))
Expect(inspect.IsJSONOutputValid()).To(BeTrue())
- // FIXME sujil, disabled for now
- //podData := inspect.InspectPodToJSON()
- //Expect(podData.Config.ID).To(Equal(podid))
+ podData := inspect.InspectPodToJSON()
+ Expect(podData.ID).To(Equal(podid))
})
})