summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-12-10 15:42:27 +0000
committerGitHub <noreply@github.com>2021-12-10 15:42:27 +0000
commit47f4f149bd4bf71223a056f95d2ae110c240c66b (patch)
treec1c6a507605889582b5c10824d38dd803f797249
parenta7690048b8f7727506fe41797d7bebd896f2499a (diff)
parent99bc00421b825823281ac684e6601b2b23a3452d (diff)
downloadpodman-47f4f149bd4bf71223a056f95d2ae110c240c66b.tar.gz
podman-47f4f149bd4bf71223a056f95d2ae110c240c66b.tar.bz2
podman-47f4f149bd4bf71223a056f95d2ae110c240c66b.zip
Merge pull request #12569 from vrothberg/fix-12167
pprof CI flakes: enforce 5 seconds grace period
-rw-r--r--test/e2e/system_service_test.go14
1 files changed, 9 insertions, 5 deletions
diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go
index 922a8c423..4299146f5 100644
--- a/test/e2e/system_service_test.go
+++ b/test/e2e/system_service_test.go
@@ -18,6 +18,10 @@ import (
var _ = Describe("podman system service", func() {
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() {
tempdir, err := CreateTempDirInTempDir()
Expect(err).ShouldNot(HaveOccurred())
@@ -45,7 +49,7 @@ var _ = Describe("podman system service", func() {
defer session.Kill()
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(body).ShouldNot(BeEmpty())
- session.Interrupt().Wait(2 * time.Second)
- Eventually(session, 5).Should(Exit(1))
+ session.Interrupt().Wait(time.Duration(timeout) * time.Second)
+ Eventually(session, timeout).Should(Exit(1))
})
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
Expect(session.Err.Contents()).ShouldNot(ContainSubstring(magicComment))
- session.Interrupt().Wait(2 * time.Second)
- Eventually(session, 5).Should(Exit(1))
+ session.Interrupt().Wait(time.Duration(timeout) * time.Second)
+ Eventually(session, timeout).Should(Exit(1))
})
})
})