Fix CI flake on time of shutdown for API service

* Increase timeout for tests to 10s
* To aid in debugging add PID to shutdown package logging
* Added new message for forced service shutdown
* Always wait for HTTP server to shutdown, duration of 0 not friendly
  to clients

Note: The log event

"IdleTracker: StateClosed transition by connection marked un-managed"

denotes a TCP connection has been initiated but no HTTP request was sent.
And is expected during these tests.

Fixes #11921

Signed-off-by: Jhon Honce <jhonce@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go
index 684ac56b4..9a4d687c3 100644
--- a/test/e2e/system_service_test.go
+++ b/test/e2e/system_service_test.go
@@ -65,7 +65,7 @@ var _ = Describe("podman system service", func() {
 
 			pprofPort := randomPort()
 			session := podmanTest.Podman([]string{
-				"system", "service", "--log-level=info", "--time=0",
+				"system", "service", "--log-level=debug", "--time=0",
 				"--pprof-address=localhost:" + pprofPort, address.String(),
 			})
 			defer session.Kill()
@@ -91,7 +91,7 @@ var _ = Describe("podman system service", func() {
 			Expect(body).ShouldNot(BeEmpty())
 
 			session.Interrupt().Wait(2 * time.Second)
-			Eventually(session, 2).Should(Exit(1))
+			Eventually(session).Should(Exit(1))
 		})
 
 		It("are not available", func() {
@@ -103,7 +103,7 @@ var _ = Describe("podman system service", func() {
 			}
 
 			session := podmanTest.Podman([]string{
-				"system", "service", "--log-level=info", "--time=0", address.String(),
+				"system", "service", "--log-level=debug", "--time=0", address.String(),
 			})
 			defer session.Kill()
 
@@ -113,7 +113,7 @@ var _ = Describe("podman system service", func() {
 			Expect(session.Err.Contents()).ShouldNot(ContainSubstring(magicComment))
 
 			session.Interrupt().Wait(2 * time.Second)
-			Eventually(session, 2).Should(Exit(1))
+			Eventually(session).Should(Exit(1))
 		})
 	})
 })