opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-15 11:42:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5992 from sujil02/v2-pod-inspect

Browse Source 
Enable pod inspect integration test
This commit is contained in:
OpenShift Merge Robot
2020-04-27 11:58:46 +02:00
committed by GitHub
parent 7c9a8fc93d c1766d5e64
commit e88b2dc0c9
4 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/common_test.go
View File

@@ -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

5
test/e2e/pod_inspect_test.go
View File

@@ -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))
})
})