test/e2e: Refactor VerifyImagePullTimer

Refactor out the logic that checks if the image pull timing, to make the assessment_runner flow cleaner. Signed-off-by: stevenhorsman <[email protected]>
stevenhorsman · Oct 29, 2024 · 3790a9a · 3790a9a
1 parent 01254bc
commit 3790a9a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/cloud-api-adaptor/test/e2e/assessment_helpers.go b/src/cloud-api-adaptor/test/e2e/assessment_helpers.go
@@ -318,6 +318,20 @@ func VerifyNydusSnapshotter(ctx context.Context, t *testing.T, client klient.Cli
 	return nil
 }
 
+func VerifyImagePullTimer(ctx context.Context, t *testing.T, client klient.Client, pod *v1.Pod) error {
+	caaPod, err := getCaaPod(ctx, client, t)
+	if err != nil {
+		return fmt.Errorf("VerifyImagePullTimer: failed to getCaaPod: %v", err)
+	}
+
+	imagePullTime, err := WatchImagePullTime(ctx, client, caaPod, pod)
+	if err != nil {
+		return fmt.Errorf("VerifyImagePullTimer: WatchImagePullTime failed with %v", err)
+	}
+	t.Logf("Time Taken to pull 4GB Image: %s", imagePullTime)
+	return nil
+}
+
 func GetNodeNameFromPod(ctx context.Context, client klient.Client, customPod *v1.Pod) (string, error) {
 	var getNodeName = func(ctx context.Context, client klient.Client, pod *v1.Pod) (string, error) {
 		return pod.Spec.NodeName, nil

diff --git a/src/cloud-api-adaptor/test/e2e/assessment_runner.go b/src/cloud-api-adaptor/test/e2e/assessment_runner.go
@@ -334,18 +334,9 @@ func (tc *TestCase) Run() {
 
 			if tc.pod != nil {
 				if tc.imagePullTimer {
-					if err := client.Resources("confidential-containers-system").List(ctx, &podlist); err != nil {
-						t.Fatal(err)
-					}
-					for _, caaPod := range podlist.Items {
-						if caaPod.Labels["app"] == "cloud-api-adaptor" {
-							imagePullTime, err := WatchImagePullTime(ctx, client, &caaPod, tc.pod)
-							if err != nil {
-								t.Fatal(err)
-							}
-							t.Logf("Time Taken to pull 4GB Image: %s", imagePullTime)
-							break
-						}
+					err := VerifyImagePullTimer(ctx, t, client, tc.pod)
+					if err != nil {
+						t.Error(err)
 					}
 				}