Merge pull request #119464 from TommyStarK/dra/cleanup-manager-unit-tests

dra: cleanup manager unit tests
This commit is contained in:
Kubernetes Prow Robot 2023-09-18 07:08:43 -07:00 committed by GitHub
commit 82bca6304b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -701,7 +701,7 @@ func TestPrepareResources(t *testing.T) {
} }
} }
func TestUnprepareResouces(t *testing.T) { func TestUnprepareResources(t *testing.T) {
fakeKubeClient := fake.NewSimpleClientset() fakeKubeClient := fake.NewSimpleClientset()
for _, test := range []struct { for _, test := range []struct {
@ -709,7 +709,6 @@ func TestUnprepareResouces(t *testing.T) {
driverName string driverName string
pod *v1.Pod pod *v1.Pod
claimInfo *ClaimInfo claimInfo *ClaimInfo
resourceClaim *resourcev1alpha2.ResourceClaim
wantErr bool wantErr bool
wantTimeout bool wantTimeout bool
wantResourceSkipped bool wantResourceSkipped bool
@ -750,27 +749,6 @@ func TestUnprepareResouces(t *testing.T) {
}, },
}, },
}, },
resourceClaim: &resourcev1alpha2.ResourceClaim{
ObjectMeta: metav1.ObjectMeta{
Name: "another-claim-test",
Namespace: "test-namespace",
UID: "test-reserved",
},
Spec: resourcev1alpha2.ResourceClaimSpec{
ResourceClassName: "test-class",
},
Status: resourcev1alpha2.ResourceClaimStatus{
DriverName: driverName,
Allocation: &resourcev1alpha2.AllocationResult{
ResourceHandles: []resourcev1alpha2.ResourceHandle{
{Data: "test-data", DriverName: driverName},
},
},
ReservedFor: []resourcev1alpha2.ResourceClaimConsumerReference{
{UID: "test-reserved"},
},
},
},
wantErr: true, wantErr: true,
}, },
{ {
@ -813,27 +791,6 @@ func TestUnprepareResouces(t *testing.T) {
PodUIDs: sets.Set[string]{"test-reserved": sets.Empty{}, "test-reserved-2": sets.Empty{}}, PodUIDs: sets.Set[string]{"test-reserved": sets.Empty{}, "test-reserved-2": sets.Empty{}},
}, },
}, },
resourceClaim: &resourcev1alpha2.ResourceClaim{
ObjectMeta: metav1.ObjectMeta{
Name: "test-pod-claim-1",
Namespace: "test-namespace",
UID: "test-reserved",
},
Spec: resourcev1alpha2.ResourceClaimSpec{
ResourceClassName: "test-class",
},
Status: resourcev1alpha2.ResourceClaimStatus{
DriverName: driverName,
Allocation: &resourcev1alpha2.AllocationResult{
ResourceHandles: []resourcev1alpha2.ResourceHandle{
{Data: "test-data", DriverName: driverName},
},
},
ReservedFor: []resourcev1alpha2.ResourceClaimConsumerReference{
{UID: "test-reserved"},
},
},
},
wantResourceSkipped: true, wantResourceSkipped: true,
}, },
{ {
@ -881,27 +838,6 @@ func TestUnprepareResouces(t *testing.T) {
}, },
}, },
}, },
resourceClaim: &resourcev1alpha2.ResourceClaim{
ObjectMeta: metav1.ObjectMeta{
Name: "test-pod-claim-2",
Namespace: "test-namespace",
UID: "test-reserved",
},
Spec: resourcev1alpha2.ResourceClaimSpec{
ResourceClassName: "test-class",
},
Status: resourcev1alpha2.ResourceClaimStatus{
DriverName: driverName,
Allocation: &resourcev1alpha2.AllocationResult{
ResourceHandles: []resourcev1alpha2.ResourceHandle{
{Data: "test-data", DriverName: driverName},
},
},
ReservedFor: []resourcev1alpha2.ResourceClaimConsumerReference{
{UID: "test-reserved"},
},
},
},
wantErr: true, wantErr: true,
wantTimeout: true, wantTimeout: true,
}, },
@ -950,27 +886,6 @@ func TestUnprepareResouces(t *testing.T) {
}, },
}, },
}, },
resourceClaim: &resourcev1alpha2.ResourceClaim{
ObjectMeta: metav1.ObjectMeta{
Name: "test-pod-claim-3",
Namespace: "test-namespace",
UID: "test-reserved",
},
Spec: resourcev1alpha2.ResourceClaimSpec{
ResourceClassName: "test-class",
},
Status: resourcev1alpha2.ResourceClaimStatus{
DriverName: driverName,
Allocation: &resourcev1alpha2.AllocationResult{
ResourceHandles: []resourcev1alpha2.ResourceHandle{
{Data: "test-data"},
},
},
ReservedFor: []resourcev1alpha2.ResourceClaimConsumerReference{
{UID: "test-reserved"},
},
},
},
}, },
} { } {
t.Run(test.description, func(t *testing.T) { t.Run(test.description, func(t *testing.T) {