chore(integration): AS-696 address integration test flakes (#392)

Author: afoley587

tests/integration/compose/common_test.go

@@ -4,6 +4,8 @@
 package integration
 
 import (
+	"fmt"
+	"strings"
 	"testing"
 	"time"
 
@@ -42,3 +44,30 @@ func get_logs(t *testing.T, dockerOptions *docker.Options, container string) str
 	output := docker.RunDockerComposeAndGetStdOut(t, dockerOptions, "logs", container)
 	return output
 }
+
+func checkContainerLogsWithRetries(subT *testing.T, dockerOptions *docker.Options, container string, tc string, expected string) {
+	maxRetries := 6
+	retryDelay := 2 * time.Second
+
+	var log string
+
+	for i := 0; i < maxRetries; i++ {
+		log = get_logs(subT, dockerOptions, container)
+		if strings.Contains(log, expected) {
+			// Log entry found, proceed to next container
+			break
+		}
+
+		// Log entry not found, wait before retrying
+		if i < maxRetries-1 {
+			time.Sleep(retryDelay)
+		}
+	}
+
+	// Final assertion
+	subT.Run(fmt.Sprintf("%s - %s", tc, container), func(t *testing.T) {
+		if !strings.Contains(log, expected) {
+			t.Errorf("%s - %s - log should contain matching entry:\n\t%s", tc, container, expected)
+		}
+	})
+}

tests/integration/compose/docker-compose-internal-auth_test.go

@@ -339,7 +339,7 @@ func (s *commonServicesInternalAuthDockerComposeUpTest) TestDockerComposeUp() {
 					validate_endpoint(subT, expected.url, expected.responsePayload, expected.httpResponseCode)
 				}
 				// Validate log output is expected
-				s.Contains(get_logs(subT, dockerOptions, expected.name), expected.log, fmt.Sprintf("%s - %s - log should contain matching entry", testCase.name, expected.name))
+				checkContainerLogsWithRetries(subT, dockerOptions, expected.name, testCase.name, expected.log)
 			}
 		})
 	}

tests/integration/compose/docker-compose-legacy-auth_test.go

@@ -337,11 +337,7 @@ func (s *commonServicesLegacyAuthDockerComposeUpTest) TestDockerComposeUp() {
 				}
 
 				// Validate log output is expected
-				s.Contains(
-					get_logs(subT, dockerOptions, expected.name),
-					expected.log,
-					fmt.Sprintf("%s - %s - log should contain matching entry", testCase.name, expected.name),
-				)
+				checkContainerLogsWithRetries(subT, dockerOptions, expected.name, testCase.name, expected.log)
 			}
 		})
 	}