mirror/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-07-20 12:12:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4121 from jwhonce/issue/4021

Browse Source 
Change ginkgo Wait() to Eventually() test
This commit is contained in:
OpenShift Merge Robot
2019-09-27 20:09:17 +02:00
committed by GitHub
parent a8c2b5dee4 f4723beac6
commit d4399eebb9
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/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
)
var _ = Describe("Podman start", func() {
@@ -107,32 +108,30 @@ var _ = Describe("Podman start", func() {
start := podmanTest.Podman([]string{"start", "-l"})
start.WaitWithDefaultTimeout()
Expect(start.ExitCode()).To(Not(Equal(0)))
Expect(start.ExitCode()).Should(BeNumerically(">", 0))
numContainers := podmanTest.NumberOfContainers()
Expect(numContainers).To(BeZero())
Eventually(podmanTest.NumberOfContainers(), defaultWaitTimeout).Should(BeZero())
})
It("podman failed to start without --rm should NOT delete the container", func() {
session := podmanTest.Podman([]string{"create", "-it", ALPINE, "foo"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session).Should(Exit(0))
start := podmanTest.Podman([]string{"start", "-l"})
start.WaitWithDefaultTimeout()
Expect(start.ExitCode()).To(Not(Equal(0)))
Expect(start.ExitCode()).Should(BeNumerically(">", 0))
numContainers := podmanTest.NumberOfContainers()
Expect(numContainers).To(Equal(1))
Eventually(podmanTest.NumberOfContainers(), defaultWaitTimeout).Should(Equal(1))
})
It("podman start --sig-proxy should not work without --attach", func() {
session := podmanTest.Podman([]string{"create", ALPINE, "ls"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session).Should(Exit(0))
session = podmanTest.Podman([]string{"start", "-l", "--sig-proxy"})
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
func (s *PodmanSession) WaitWithDefaultTimeout() {
s.Wait(defaultWaitTimeout)
Eventually(s, defaultWaitTimeout).Should(gexec.Exit())
os.Stdout.Sync()
os.Stderr.Sync()
fmt.Println("output:", s.OutputToString())