opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-16 10:43:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Enable pod inspect integration test

Browse Source 
Enable pod inspect integration  test
Get rid of libpod pod inspect references
Remove libpod PodInspect struct.

Signed-off-by: Sujil02 <sushah@redhat.com>
This commit is contained in:
Sujil02
2020-04-26 16:23:42 -04:00
parent 13c1d2c6af
commit c1766d5e64
4 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libpod/pod.go
View File

@ -76,27 +76,6 @@ type podState struct {
InfraContainerID string InfraContainerID string
} }
// PodInspect represents the data we want to display for
// podman pod inspect
type PodInspect struct {
Config *PodConfig
State *PodInspectState
Containers []PodContainerInfo
}
// PodInspectState contains inspect data on the pod's state
type PodInspectState struct {
CgroupPath string `json:"cgroupPath"`
InfraContainerID string `json:"infraContainerID"`
Status string `json:"status"`
}
// PodContainerInfo keeps information on a container in a pod
type PodContainerInfo struct {
ID string `json:"id"`
State string `json:"state"`
}
// InfraContainerConfig is the configuration for the pod's infra container // InfraContainerConfig is the configuration for the pod's infra container
type InfraContainerConfig struct { type InfraContainerConfig struct {
HasInfraContainer bool `json:"makeInfraContainer"` HasInfraContainer bool `json:"makeInfraContainer"`

2
pkg/api/handlers/swagger/swagger.go
View File

@ -143,7 +143,7 @@ type swagListPodsResponse struct {
type swagInspectPodResponse struct { type swagInspectPodResponse struct {
// in:body // in:body
Body struct { Body struct {
libpod.PodInspect define.InspectPodData
} }
} }

5
test/e2e/common_test.go
View File

@ -14,7 +14,6 @@ import (
"testing" "testing"
"time" "time"
"github.com/containers/libpod/libpod"
"github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/inspect"
"github.com/containers/libpod/pkg/rootless" "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 // InspectPodToJSON takes the sessions output from a pod inspect and returns json
func (s *PodmanSessionIntegration) InspectPodToJSON() libpod.PodInspect { func (s *PodmanSessionIntegration) InspectPodToJSON() define.InspectPodData {
var i libpod.PodInspect var i define.InspectPodData
err := json.Unmarshal(s.Out.Contents(), &i) err := json.Unmarshal(s.Out.Contents(), &i)
Expect(err).To(BeNil()) Expect(err).To(BeNil())
return i return i

6
test/e2e/pod_inspect_test.go
View File

@ -16,7 +16,6 @@ var _ = Describe("Podman pod inspect", func() {
) )
BeforeEach(func() { BeforeEach(func() {
Skip(v2fail)
tempdir, err = CreateTempDirInTempDir() tempdir, err = CreateTempDirInTempDir()
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)
@ -55,8 +54,7 @@ var _ = Describe("Podman pod inspect", func() {
inspect.WaitWithDefaultTimeout() inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(Equal(0)) Expect(inspect.ExitCode()).To(Equal(0))
Expect(inspect.IsJSONOutputValid()).To(BeTrue()) Expect(inspect.IsJSONOutputValid()).To(BeTrue())
// FIXME sujil, disabled for now podData := inspect.InspectPodToJSON()
//podData := inspect.InspectPodToJSON() Expect(podData.ID).To(Equal(podid))
//Expect(podData.Config.ID).To(Equal(podid))
}) })
}) })