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

Merge pull request #12569 from vrothberg/fix-12167 

pprof CI flakes: enforce 5 seconds grace period
This commit is contained in:
OpenShift Merge Robot 2021-12-10 15:42:27 +00:00 committed by GitHub
parent a7690048b8 99bc00421b
commit 47f4f149bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/system_service_test.go
View File

@ -18,6 +18,10 @@ import (
var _ = Describe("podman system service", func() { var _ = Describe("podman system service", func() {
var podmanTest *PodmanTestIntegration var podmanTest *PodmanTestIntegration
// The timeout used to for the service to respond. As shown in #12167,
// this may take some time on machines under high load.
var timeout = 5
BeforeEach(func() { BeforeEach(func() {
tempdir, err := CreateTempDirInTempDir() tempdir, err := CreateTempDirInTempDir()
Expect(err).ShouldNot(HaveOccurred()) Expect(err).ShouldNot(HaveOccurred())
@ -45,7 +49,7 @@ var _ = Describe("podman system service", func() {
defer session.Kill() defer session.Kill()
WaitForService(address) WaitForService(address)
Eventually(session, 5).Should(Exit(0)) Eventually(session, timeout).Should(Exit(0))
}) })
}) })
@ -88,8 +92,8 @@ var _ = Describe("podman system service", func() {
Expect(err).ShouldNot(HaveOccurred()) Expect(err).ShouldNot(HaveOccurred())
Expect(body).ShouldNot(BeEmpty()) Expect(body).ShouldNot(BeEmpty())
session.Interrupt().Wait(2 * time.Second) session.Interrupt().Wait(time.Duration(timeout) * time.Second)
Eventually(session, 5).Should(Exit(1)) Eventually(session, timeout).Should(Exit(1))
}) })
It("are not available", func() { It("are not available", func() {
@ -110,8 +114,8 @@ var _ = Describe("podman system service", func() {
// Combined with test above we have positive/negative test for pprof // Combined with test above we have positive/negative test for pprof
Expect(session.Err.Contents()).ShouldNot(ContainSubstring(magicComment)) Expect(session.Err.Contents()).ShouldNot(ContainSubstring(magicComment))
session.Interrupt().Wait(2 * time.Second) session.Interrupt().Wait(time.Duration(timeout) * time.Second)
Eventually(session, 5).Should(Exit(1)) Eventually(session, timeout).Should(Exit(1))
}) })
}) })
}) })