From 0ec99fb0b24744b6456646f9c2296b8cf900ace1 Mon Sep 17 00:00:00 2001
From: Ed Bartosh <eduard.bartosh@intel.com>
Date: Tue, 18 Jul 2023 19:06:33 +0300
Subject: [PATCH] Kubelet DRA: fix failing test cases

---
 pkg/kubelet/cm/dra/manager_test.go | 56 ++++++++++--------------------
 1 file changed, 18 insertions(+), 38 deletions(-)

diff --git a/pkg/kubelet/cm/dra/manager_test.go b/pkg/kubelet/cm/dra/manager_test.go
index e6a2e1d4074..9adb2463d26 100644
--- a/pkg/kubelet/cm/dra/manager_test.go
+++ b/pkg/kubelet/cm/dra/manager_test.go
@@ -714,38 +714,6 @@ func TestUnprepareResouces(t *testing.T) {
 		wantTimeout         bool
 		wantResourceSkipped bool
 	}{
-		{
-			description: "failed to fetch resource claim",
-			driverName:  driverName,
-			pod: &v1.Pod{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-pod",
-					Namespace: "test-namespace",
-					UID:       "test-reserved",
-				},
-				Spec: v1.PodSpec{
-					ResourceClaims: []v1.PodResourceClaim{
-						{
-							Name: "test-pod-claim-0",
-							Source: v1.ClaimSource{
-								ResourceClaimName: func() *string {
-									s := "test-pod-claim-0"
-									return &s
-								}(),
-							},
-						},
-					},
-				},
-			},
-			claimInfo: &ClaimInfo{
-				ClaimInfoState: state.ClaimInfoState{
-					DriverName: driverName,
-					ClaimName:  "test-pod-claim-0",
-					Namespace:  "test-namespace",
-				},
-			},
-			wantErr: true,
-		},
 		{
 			description: "plugin does not exist",
 			driverName:  "this-plugin-does-not-exist",
@@ -774,6 +742,12 @@ func TestUnprepareResouces(t *testing.T) {
 					DriverName: driverName,
 					ClaimName:  "another-claim-test",
 					Namespace:  "test-namespace",
+					ResourceHandles: []resourcev1alpha2.ResourceHandle{
+						{
+							DriverName: driverName,
+							Data:       "test data",
+						},
+					},
 				},
 			},
 			resourceClaim: &resourcev1alpha2.ResourceClaim{
@@ -899,6 +873,12 @@ func TestUnprepareResouces(t *testing.T) {
 					DriverName: driverName,
 					ClaimName:  "test-pod-claim-2",
 					Namespace:  "test-namespace",
+					ResourceHandles: []resourcev1alpha2.ResourceHandle{
+						{
+							DriverName: driverName,
+							Data:       "test data",
+						},
+					},
 				},
 			},
 			resourceClaim: &resourcev1alpha2.ResourceClaim{
@@ -962,6 +942,12 @@ func TestUnprepareResouces(t *testing.T) {
 					DriverName: driverName,
 					ClaimName:  "test-pod-claim-3",
 					Namespace:  "test-namespace",
+					ResourceHandles: []resourcev1alpha2.ResourceHandle{
+						{
+							DriverName: driverName,
+							Data:       "test data",
+						},
+					},
 				},
 			},
 			resourceClaim: &resourcev1alpha2.ResourceClaim{
@@ -1010,12 +996,6 @@ func TestUnprepareResouces(t *testing.T) {
 				cache:      cache,
 			}
 
-			if test.resourceClaim != nil {
-				if _, err := fakeKubeClient.ResourceV1alpha2().ResourceClaims(test.pod.Namespace).Create(context.Background(), test.resourceClaim, metav1.CreateOptions{}); err != nil {
-					t.Fatalf("failed to create ResourceClaim %s: %+v", test.resourceClaim.Name, err)
-				}
-			}
-
 			if test.claimInfo != nil {
 				manager.cache.add(test.claimInfo)
 			}