From ccb15348ec8cd856289d5aad6dcfc130d81a4174 Mon Sep 17 00:00:00 2001
From: Michael Wilkerson <62034708+wilkermichael@users.noreply.github.com>
Date: Mon, 10 Jul 2023 18:02:34 -0700
Subject: [PATCH] Fix test flakes. (#2483) (#2544)

Co-authored-by: Derek Menteer <105233703+hashi-derek@users.noreply.github.com>
---
 .../framework/connhelper/connect_helper.go    | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/acceptance/framework/connhelper/connect_helper.go b/acceptance/framework/connhelper/connect_helper.go
index cad6ba6885..cc9d58c810 100644
--- a/acceptance/framework/connhelper/connect_helper.go
+++ b/acceptance/framework/connhelper/connect_helper.go
@@ -117,18 +117,19 @@ func (c *ConnectHelper) DeployClientAndServer(t *testing.T) {
 
 	// Check that both static-server and static-client have been injected and
 	// now have 2 containers.
-
-	retrier := &retry.Timer{Timeout: 300 * time.Second, Wait: 100 * time.Millisecond}
-	retry.RunWith(retrier, t, func(r *retry.R) {
-		for _, labelSelector := range []string{"app=static-server", "app=static-client"} {
-			podList, err := c.Ctx.KubernetesClient(t).CoreV1().Pods(c.Ctx.KubectlOptions(t).Namespace).List(context.Background(), metav1.ListOptions{
-				LabelSelector: labelSelector,
-			})
-			require.NoError(t, err)
-			require.Len(t, podList.Items, 1)
-			require.Len(t, podList.Items[0].Spec.Containers, 2)
-		}
-	})
+	retry.RunWith(
+		&retry.Timer{Timeout: 30 * time.Second, Wait: 100 * time.Millisecond}, t,
+		func(r *retry.R) {
+			for _, labelSelector := range []string{"app=static-server", "app=static-client"} {
+				podList, err := c.Ctx.KubernetesClient(t).CoreV1().Pods(c.Ctx.KubectlOptions(t).Namespace).List(context.Background(), metav1.ListOptions{
+					LabelSelector: labelSelector,
+					FieldSelector: `status.phase=Running`,
+				})
+				require.NoError(r, err)
+				require.Len(r, podList.Items, 1)
+				require.Len(r, podList.Items[0].Spec.Containers, 2)
+			}
+		})
 }
 
 // TestConnectionFailureWithoutIntention ensures the connection to the static