mirror of https://github.com/containers/podman.git
				
				
				
			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 <rothberg@redhat.com>
This commit is contained in:
		
							parent
							
								
									f80a7fda74
								
							
						
					
					
						commit
						99bc00421b
					
				|  | @ -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)) | ||||
| 		}) | ||||
| 	}) | ||||
| }) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue