mirror of
https://github.com/containers/podman.git
synced 2025-06-21 01:19:15 +08:00
Merge pull request #5975 from giuseppe/fix-pause-tests
[v2] tests: fix pause tests
This commit is contained in:
@ -223,7 +223,7 @@ func createPsOut() (string, string) {
|
|||||||
}
|
}
|
||||||
headers := defaultHeaders
|
headers := defaultHeaders
|
||||||
row += "{{.ID}}"
|
row += "{{.ID}}"
|
||||||
row += "\t{{.Image}}\t{{.Command}}\t{{.CreatedHuman}}\t{{.State}}\t{{.Ports}}\t{{.Names}}"
|
row += "\t{{.Image}}\t{{.Command}}\t{{.CreatedHuman}}\t{{.Status}}\t{{.Ports}}\t{{.Names}}"
|
||||||
|
|
||||||
if listOpts.Pod {
|
if listOpts.Pod {
|
||||||
headers += "\tPOD ID\tPODNAME"
|
headers += "\tPOD ID\tPODNAME"
|
||||||
@ -282,6 +282,11 @@ func (l psReporter) State() string {
|
|||||||
return state
|
return state
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Status is a synonym for State()
|
||||||
|
func (l psReporter) Status() string {
|
||||||
|
return l.State()
|
||||||
|
}
|
||||||
|
|
||||||
// Command returns the container command in string format
|
// Command returns the container command in string format
|
||||||
func (l psReporter) Command() string {
|
func (l psReporter) Command() string {
|
||||||
return strings.Join(l.ListContainer.Command, " ")
|
return strings.Join(l.ListContainer.Command, " ")
|
||||||
|
@ -2,7 +2,10 @@ package integration
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/containers/libpod/pkg/cgroups"
|
"github.com/containers/libpod/pkg/cgroups"
|
||||||
. "github.com/containers/libpod/test/utils"
|
. "github.com/containers/libpod/test/utils"
|
||||||
@ -17,8 +20,8 @@ var _ = Describe("Podman pause", func() {
|
|||||||
podmanTest *PodmanTestIntegration
|
podmanTest *PodmanTestIntegration
|
||||||
)
|
)
|
||||||
|
|
||||||
pausedState := "Paused"
|
pausedState := "paused"
|
||||||
createdState := "Created"
|
createdState := "created"
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
SkipIfRootless()
|
SkipIfRootless()
|
||||||
@ -31,7 +34,13 @@ var _ = Describe("Podman pause", func() {
|
|||||||
Expect(err).To(BeNil())
|
Expect(err).To(BeNil())
|
||||||
|
|
||||||
if cgroupsv2 {
|
if cgroupsv2 {
|
||||||
_, err := os.Stat("/sys/fs/cgroup/cgroup.freeze")
|
b, err := ioutil.ReadFile("/proc/self/cgroup")
|
||||||
|
if err != nil {
|
||||||
|
Skip("cannot read self cgroup")
|
||||||
|
}
|
||||||
|
|
||||||
|
path := filepath.Join("/sys/fs/cgroup", strings.TrimSuffix(strings.Replace(string(b), "0::", "", 1), "\n"), "cgroup.freeze")
|
||||||
|
_, err = os.Stat(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
Skip("freezer controller not available on the current kernel")
|
Skip("freezer controller not available on the current kernel")
|
||||||
}
|
}
|
||||||
@ -72,7 +81,7 @@ var _ = Describe("Podman pause", func() {
|
|||||||
|
|
||||||
Expect(result).To(ExitWithError())
|
Expect(result).To(ExitWithError())
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(createdState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(ContainSubstring(createdState))
|
||||||
})
|
})
|
||||||
|
|
||||||
It("podman pause a running container by id", func() {
|
It("podman pause a running container by id", func() {
|
||||||
@ -85,7 +94,7 @@ var _ = Describe("Podman pause", func() {
|
|||||||
|
|
||||||
Expect(result.ExitCode()).To(Equal(0))
|
Expect(result.ExitCode()).To(Equal(0))
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(ContainSubstring(pausedState))
|
||||||
|
|
||||||
result = podmanTest.Podman([]string{"unpause", cid})
|
result = podmanTest.Podman([]string{"unpause", cid})
|
||||||
result.WaitWithDefaultTimeout()
|
result.WaitWithDefaultTimeout()
|
||||||
@ -102,7 +111,7 @@ var _ = Describe("Podman pause", func() {
|
|||||||
|
|
||||||
Expect(result.ExitCode()).To(Equal(0))
|
Expect(result.ExitCode()).To(Equal(0))
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(ContainSubstring(pausedState))
|
||||||
|
|
||||||
result = podmanTest.Podman([]string{"container", "unpause", cid})
|
result = podmanTest.Podman([]string{"container", "unpause", cid})
|
||||||
result.WaitWithDefaultTimeout()
|
result.WaitWithDefaultTimeout()
|
||||||
@ -133,14 +142,14 @@ var _ = Describe("Podman pause", func() {
|
|||||||
|
|
||||||
Expect(result.ExitCode()).To(Equal(0))
|
Expect(result.ExitCode()).To(Equal(0))
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(ContainSubstring(pausedState))
|
||||||
|
|
||||||
result = podmanTest.Podman([]string{"rm", cid})
|
result = podmanTest.Podman([]string{"rm", cid})
|
||||||
result.WaitWithDefaultTimeout()
|
result.WaitWithDefaultTimeout()
|
||||||
|
|
||||||
Expect(result.ExitCode()).To(Equal(2))
|
Expect(result.ExitCode()).To(Equal(2))
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(ContainSubstring(pausedState))
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -155,7 +164,7 @@ var _ = Describe("Podman pause", func() {
|
|||||||
|
|
||||||
Expect(result.ExitCode()).To(Equal(0))
|
Expect(result.ExitCode()).To(Equal(0))
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(ContainSubstring(pausedState))
|
||||||
|
|
||||||
result = podmanTest.Podman([]string{"rm", "--force", cid})
|
result = podmanTest.Podman([]string{"rm", "--force", cid})
|
||||||
result.WaitWithDefaultTimeout()
|
result.WaitWithDefaultTimeout()
|
||||||
@ -175,14 +184,14 @@ var _ = Describe("Podman pause", func() {
|
|||||||
|
|
||||||
Expect(result.ExitCode()).To(Equal(0))
|
Expect(result.ExitCode()).To(Equal(0))
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(ContainSubstring(pausedState))
|
||||||
|
|
||||||
result = podmanTest.Podman([]string{"stop", cid})
|
result = podmanTest.Podman([]string{"stop", cid})
|
||||||
result.WaitWithDefaultTimeout()
|
result.WaitWithDefaultTimeout()
|
||||||
|
|
||||||
Expect(result.ExitCode()).To(Equal(125))
|
Expect(result.ExitCode()).To(Equal(125))
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(ContainSubstring(pausedState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(ContainSubstring(pausedState))
|
||||||
|
|
||||||
result = podmanTest.Podman([]string{"unpause", cid})
|
result = podmanTest.Podman([]string{"unpause", cid})
|
||||||
result.WaitWithDefaultTimeout()
|
result.WaitWithDefaultTimeout()
|
||||||
@ -211,7 +220,7 @@ var _ = Describe("Podman pause", func() {
|
|||||||
|
|
||||||
Expect(result.ExitCode()).To(Equal(0))
|
Expect(result.ExitCode()).To(Equal(0))
|
||||||
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
|
||||||
Expect(podmanTest.GetContainerStatus()).To(Equal(pausedState))
|
Expect(strings.ToLower(podmanTest.GetContainerStatus())).To(Equal(pausedState))
|
||||||
|
|
||||||
result = podmanTest.Podman([]string{"unpause", "test1"})
|
result = podmanTest.Podman([]string{"unpause", "test1"})
|
||||||
result.WaitWithDefaultTimeout()
|
result.WaitWithDefaultTimeout()
|
||||||
|
@ -15,10 +15,9 @@ var _ = Describe("Podman pod pause", func() {
|
|||||||
podmanTest *PodmanTestIntegration
|
podmanTest *PodmanTestIntegration
|
||||||
)
|
)
|
||||||
|
|
||||||
pausedState := "Paused"
|
pausedState := "paused"
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
Skip(v2fail)
|
|
||||||
SkipIfRootless()
|
SkipIfRootless()
|
||||||
tempdir, err = CreateTempDirInTempDir()
|
tempdir, err = CreateTempDirInTempDir()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Reference in New Issue
Block a user