diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 11:58:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 11:58:46 +0200 |
| commit | e88b2dc0c9ba6ddadb6bf31f652e1ad41468f58f (patch) | |
| tree | 5738cda26120027f5bc1646d3e51bc0eb5b28216 /test | |
| parent | 7c9a8fc93d1700bf0399bf78fc875fb1edb93651 (diff) | |
| parent | c1766d5e6496d48d357907598a44e147642a877e (diff) | |
| download | podman-e88b2dc0c9ba6ddadb6bf31f652e1ad41468f58f.tar.gz podman-e88b2dc0c9ba6ddadb6bf31f652e1ad41468f58f.tar.bz2 podman-e88b2dc0c9ba6ddadb6bf31f652e1ad41468f58f.zip | |
Merge pull request #5992 from sujil02/v2-pod-inspect
Enable pod inspect integration test
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/common_test.go | 5 | ||||
| -rw-r--r-- | test/e2e/pod_inspect_test.go | 5 |
2 files changed, 4 insertions, 6 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 d86c36f58..f87bbe047 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -54,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)) }) }) |