opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-04 13:08:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change ginkgo Wait() to Eventually() test

Browse Source 
Changing the test in WaitWithDefaultTimeout() to use Eventually() and
gexec.Exit(). Using ExitCode() before command has really exited returns
a -1, which can cause issues for tests testing for podman to return
non-zero values.

Signed-off-by: Jhon Honce <jhonce@redhat.com>
This commit is contained in:
Jhon Honce
2019-09-26 10:26:40 -07:00
parent 851e3775d5
commit f4723beac6
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/start_test.go
View File

@ -6,6 +6,7 @@ import (
. "github.com/containers/libpod/test/utils" . "github.com/containers/libpod/test/utils"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
) )
var _ = Describe("Podman start", func() { var _ = Describe("Podman start", func() {
@ -107,32 +108,30 @@ var _ = Describe("Podman start", func() {
start := podmanTest.Podman([]string{"start", "-l"}) start := podmanTest.Podman([]string{"start", "-l"})
start.WaitWithDefaultTimeout() start.WaitWithDefaultTimeout()
Expect(start.ExitCode()).To(Not(Equal(0))) Expect(start.ExitCode()).Should(BeNumerically(">", 0))
numContainers := podmanTest.NumberOfContainers() Eventually(podmanTest.NumberOfContainers(), defaultWaitTimeout).Should(BeZero())
Expect(numContainers).To(BeZero())
}) })
It("podman failed to start without --rm should NOT delete the container", func() { It("podman failed to start without --rm should NOT delete the container", func() {
session := podmanTest.Podman([]string{"create", "-it", ALPINE, "foo"}) session := podmanTest.Podman([]string{"create", "-it", ALPINE, "foo"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session).Should(Exit(0))
start := podmanTest.Podman([]string{"start", "-l"}) start := podmanTest.Podman([]string{"start", "-l"})
start.WaitWithDefaultTimeout() start.WaitWithDefaultTimeout()
Expect(start.ExitCode()).To(Not(Equal(0))) Expect(start.ExitCode()).Should(BeNumerically(">", 0))
numContainers := podmanTest.NumberOfContainers() Eventually(podmanTest.NumberOfContainers(), defaultWaitTimeout).Should(Equal(1))
Expect(numContainers).To(Equal(1))
}) })
It("podman start --sig-proxy should not work without --attach", func() { It("podman start --sig-proxy should not work without --attach", func() {
session := podmanTest.Podman([]string{"create", ALPINE, "ls"}) session := podmanTest.Podman([]string{"create", ALPINE, "ls"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0)) Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"start", "-l", "--sig-proxy"}) session = podmanTest.Podman([]string{"start", "-l", "--sig-proxy"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(125)) Expect(session).Should(Exit(125))
}) })
}) })

2
test/utils/utils.go
View File

@ -320,7 +320,7 @@ func (s *PodmanSession) IsJSONOutputValid() bool {
// WaitWithDefaultTimeout waits for process finished with defaultWaitTimeout // WaitWithDefaultTimeout waits for process finished with defaultWaitTimeout
func (s *PodmanSession) WaitWithDefaultTimeout() { func (s *PodmanSession) WaitWithDefaultTimeout() {
s.Wait(defaultWaitTimeout) Eventually(s, defaultWaitTimeout).Should(gexec.Exit())
os.Stdout.Sync() os.Stdout.Sync()
os.Stderr.Sync() os.Stderr.Sync()
fmt.Println("output:", s.OutputToString()) fmt.Println("output:", s.OutputToString())