From 99bc00421b825823281ac684e6601b2b23a3452d Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Fri, 10 Dec 2021 14:57:01 +0100 Subject: pprof CI flakes: enforce 5 seconds grace period This gives the service 5 seconds to digest the signal and 5 more seconds to shutdown. Create a new variable to make bumping the timeout easier in case we see re-flake in the future. Fixes: #12167 Signed-off-by: Valentin Rothberg --- test/e2e/system_service_test.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'test') 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)) }) }) }) -- cgit v1.2.3-54-g00ecf