Skip checking gateway container logs for errors

Author: ciarams87

tests/suite/graceful_recovery_test.go

@@ -127,9 +127,6 @@ func runRecoveryTest(teaURL, coffeeURL, ngfPodName, containerName string, files
 			Should(Succeed())
 	}
 
-	// TEMP: Add sleep to see if it resolves falures
-	time.Sleep(30 * time.Second)
-
 	Eventually(
 		func() error {
 			return checkForWorkingTraffic(teaURL, coffeeURL)
@@ -159,7 +156,7 @@ func runRecoveryTest(teaURL, coffeeURL, ngfPodName, containerName string, files
 		WithPolling(500 * time.Millisecond).
 		Should(Succeed())
 
-	checkContainerLogsForErrors(ngfPodName)
+	checkContainerLogsForErrors(ngfPodName, containerName == nginxContainerName)
 }
 
 func restartContainer(ngfPodName, containerName string) {
@@ -261,15 +258,17 @@ func expectRequestToFail(appURL, address string) error {
 // Since this function retrieves all the logs from both containers and the NGF pod may be shared between tests,
 // the logs retrieved may contain log messages from previous tests, thus any errors in the logs from previous tests
 // may cause an interference with this test and cause this test to fail.
-func checkContainerLogsForErrors(ngfPodName string) {
-	logs, err := resourceManager.GetPodLogs(
+// Additionally, when the NGINX process is killed, some errors are expected in the NGF logs while we wait for the
+// NGINX container to be restarted.
+func checkContainerLogsForErrors(ngfPodName string, checkNginxLogsOnly bool) {
+	nginxLogs, err := resourceManager.GetPodLogs(
 		ngfNamespace,
 		ngfPodName,
 		&core.PodLogOptions{Container: nginxContainerName},
 	)
 	Expect(err).ToNot(HaveOccurred())
 
-	for _, line := range strings.Split(logs, "\n") {
+	for _, line := range strings.Split(nginxLogs, "\n") {
 		Expect(line).ToNot(ContainSubstring("[crit]"), line)
 		Expect(line).ToNot(ContainSubstring("[alert]"), line)
 		Expect(line).ToNot(ContainSubstring("[emerg]"), line)
@@ -282,18 +281,20 @@ func checkContainerLogsForErrors(ngfPodName string) {
 		}
 	}
 
-	logs, err = resourceManager.GetPodLogs(
-		ngfNamespace,
-		ngfPodName,
-		&core.PodLogOptions{Container: ngfContainerName},
-	)
-	Expect(err).ToNot(HaveOccurred())
+	if !checkNginxLogsOnly {
+		ngfLogs, err := resourceManager.GetPodLogs(
+			ngfNamespace,
+			ngfPodName,
+			&core.PodLogOptions{Container: ngfContainerName},
+		)
+		Expect(err).ToNot(HaveOccurred())
 
-	for _, line := range strings.Split(logs, "\n") {
-		if *plusEnabled && strings.Contains(line, "\"level\":\"error\"") {
-			Expect(line).To(ContainSubstring("Usage reporting must be enabled when using NGINX Plus"), line)
-		} else {
-			Expect(line).ToNot(ContainSubstring("\"level\":\"error\""), line)
+		for _, line := range strings.Split(ngfLogs, "\n") {
+			if *plusEnabled && strings.Contains(line, "\"level\":\"error\"") {
+				Expect(line).To(ContainSubstring("Usage reporting must be enabled when using NGINX Plus"), line)
+			} else {
+				Expect(line).ToNot(ContainSubstring("\"level\":\"error\""), line)
+			}
 		}
 	}
 }