Merge pull request #997 from cloudfoundry/readiness-hc-events

update readiness health check test to test audit events
cloudfoundry · Jan 22, 2024 · 974b7f3 · 974b7f3
2 parents 6ec60a8 + f1bcdfa
commit 974b7f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/apps/readiness_healthcheck.go b/apps/readiness_healthcheck.go
@@ -51,8 +51,7 @@ var _ = AppsDescribe("Readiness Healthcheck", func() {
 				return helpers.CurlApp(Config, appName, "/ready")
 			}, Config.DefaultTimeoutDuration()).Should(ContainSubstring("200 - ready"))
 
-			// TODO: only include this when audit events are built
-			// Eventually(cf.Cf("events", appName)).Should(Say("app.ready"))
+			Eventually(cf.Cf("events", appName)).Should(Say("app.process.ready"))
 
 			Expect(logs.Recent(appName).Wait()).To(Say("Container passed the readiness health check"))
 
@@ -61,8 +60,7 @@ var _ = AppsDescribe("Readiness Healthcheck", func() {
 
 			By("verifying the app is marked as not ready")
 
-			// TODO: only include this when audit events are built
-			// Eventually(cf.Cf("events", appName)).Should(Say("app.notready"))
+			Eventually(cf.Cf("events", appName)).Should(Say("app.process.not-ready"))
 
 			Eventually(func() BufferProvider { return logs.Recent(appName).Wait() }, readinessHealthCheckTimeout).Should(Say("Container failed the readiness health check"))
 

diff --git a/windows/readiness_healthcheck.go b/windows/readiness_healthcheck.go
@@ -52,8 +52,7 @@ var _ = WindowsDescribe("Readiness Healthcheck", func() {
 				return helpers.CurlApp(Config, appName, "/ready")
 			}, Config.DefaultTimeoutDuration()).Should(ContainSubstring("200 - ready"))
 
-			// TODO: only include this when audit events are built
-			// Eventually(cf.Cf("events", appName)).Should(Say("app.ready"))
+			Eventually(cf.Cf("events", appName)).Should(Say("app.process.ready"))
 
 			Expect(logs.Recent(appName).Wait()).To(Say("Container passed the readiness health check"))
 
@@ -62,8 +61,7 @@ var _ = WindowsDescribe("Readiness Healthcheck", func() {
 
 			By("verifying the app is marked as not ready")
 
-			// TODO: only include this when audit events are built
-			// Eventually(cf.Cf("events", appName)).Should(Say("app.notready"))
+			Eventually(cf.Cf("events", appName)).Should(Say("app.process.not-ready"))
 
 			Eventually(func() BufferProvider { return logs.Recent(appName).Wait() }, readinessHealthCheckTimeout).Should(Say("Container failed the readiness health check"))