Updates since removing the WaitForRunningPodCount helper

Removed WaitForRunningPodCount and opted to go with WaitForScaledJobCount followed by WaitForAllPodRunningInNamespace since that keeps the changes a bit more concise and works for what this test needs.

Issue #3661

Signed-off-by: jansworld <navon.josh@gmail.com>

Author: jansworld

tests/helper/helper.go

@@ -490,36 +490,6 @@ func WaitForAllPodRunningInNamespace(t *testing.T, kc *kubernetes.Clientset, nam
 	return false
 }
 
-// Waits until the target number of pods is running. If running pod count differs from target, returns false.
-func WaitForRunningPodCount(t *testing.T, kc *kubernetes.Clientset, scaledJobName, namespace string, target, iterations, interval int) bool {
-	for i := 0; i < iterations; i++ {
-		pods, err := kc.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{
-			LabelSelector: fmt.Sprintf("scaledjob.keda.sh/name=%s", scaledJobName),
-		})
-		if err != nil {
-			t.Logf("cannot list pods - %s", err)
-		}
-
-		runningPodCount := 0
-		for _, pod := range pods.Items {
-			if pod.Status.Phase == corev1.PodRunning {
-				runningPodCount++
-			}
-		}
-
-		t.Logf("Waiting for running pods. Namespace - %s, Current - %d, Target - %d",
-			namespace, runningPodCount, target)
-		if runningPodCount == target {
-			return true
-		} else if runningPodCount > target {
-			return false
-		}
-
-		time.Sleep(time.Duration(interval) * time.Second)
-	}
-	return false
-}
-
 // Waits until the Horizontal Pod Autoscaler for the scaledObject reports that it has metrics available
 // to calculate, or until the number of iterations are done, whichever happens first.
 func WaitForHPAMetricsToPopulate(t *testing.T, kc *kubernetes.Clientset, name, namespace string, iterations, intervalSeconds int) bool {

tests/internals/scaling_strategies/accurate_scaling_strategy/accurate_scaling_strategy_test.go

@@ -134,8 +134,10 @@ func testAccurateScaling(ctx context.Context, t *testing.T, kc *kubernetes.Clien
 
 	// Base case (number of scale = maxScale since pendingJobs = 0)
 	enqueueMessages(ctx, t, client, 4)
-	assert.True(t, WaitForRunningPodCount(t, kc, scaledJobName, testNamespace, 4, iterationCount, 1),
+	assert.True(t, WaitForScaledJobCount(t, kc, scaledJobName, testNamespace, 4, iterationCount, 1),
 		"job count should be %d after %d iterations", 4, iterationCount)
+	assert.True(t, WaitForAllPodRunningInNamespace(t, kc, testNamespace, iterationCount, 1),
+		"all scaledjob pods should be running after %d iterations", iterationCount)
 
 	// Clear the queue to simulate message consumption and wait for job completion
 	_, err := client.ClearMessages(ctx, nil)
@@ -144,17 +146,21 @@ func testAccurateScaling(ctx context.Context, t *testing.T, kc *kubernetes.Clien
 
 	// Test the cap condition (maxScale + runningJobs > maxReplicaCount)
 	enqueueMessages(ctx, t, client, 4)
-	assert.True(t, WaitForRunningPodCount(t, kc, scaledJobName, testNamespace, 4, iterationCount, 1),
+	assert.True(t, WaitForScaledJobCount(t, kc, scaledJobName, testNamespace, 4, iterationCount, 1),
 		"running job count should be %d after %d iterations", 4, iterationCount)
+	assert.True(t, WaitForAllPodRunningInNamespace(t, kc, testNamespace, iterationCount, 1),
+		"all scaledjob pods should be running after %d iterations", iterationCount)
 
 	// Clear the messages to simulate message consumption
 	_, err = client.ClearMessages(ctx, nil)
 	assert.NoErrorf(t, err, "cannot clear queue - %s", err)
 
 	// Queue up 8 more messages to trigger the cap condition
 	enqueueMessages(ctx, t, client, 8)
-	assert.True(t, WaitForRunningPodCount(t, kc, scaledJobName, testNamespace, 10, iterationCount, 1),
+	assert.True(t, WaitForScaledJobCount(t, kc, scaledJobName, testNamespace, 10, iterationCount, 1),
 		"running job count should be %d after %d iterations", 10, iterationCount)
+	assert.True(t, WaitForAllPodRunningInNamespace(t, kc, testNamespace, iterationCount, 1),
+		"all scaledjob pods should be running after %d iterations", iterationCount)
 
 	// Message cleanup and wait for jobs to complete
 	_, err = client.ClearMessages(ctx, nil)