containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: fix pause tests 

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2020-04-24 17:30:29 +02:00
parent edbdbe5b3a
commit e750c13b70
No known key found for this signature in database
GPG Key ID: E4730F97F60286ED
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
test/e2e/pause_test.go
View File

@ -3,6 +3,7 @@ package integration
import ( import (
"fmt" "fmt"
"os" "os"
"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 +18,8 @@ var _ = Describe("Podman pause", func() {
podmanTest *PodmanTestIntegration podmanTest *PodmanTestIntegration
) )
pausedState := "Paused" pausedState := "paused"
createdState := "Created" createdState := "created"
BeforeEach(func() { BeforeEach(func() {
SkipIfRootless() SkipIfRootless()
@ -72,7 +73,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 +86,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 +103,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 +134,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 +156,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 +176,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 +212,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()

3
test/e2e/pod_pause_test.go
View File

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