From 0be60286682693a7ae0d55cf09eae9ce353bedd8 Mon Sep 17 00:00:00 2001 From: shawnhanx Date: Fri, 14 May 2021 10:13:24 +0800 Subject: [PATCH 1/2] add pvcquota testcase --- .../core/persistent_volume_claims_test.go | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go b/pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go index 244af605921..03156639005 100644 --- a/pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go +++ b/pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go @@ -17,6 +17,7 @@ limitations under the License. package core import ( + "reflect" "testing" corev1 "k8s.io/api/core/v1" @@ -136,3 +137,47 @@ func TestPersistentVolumeClaimEvaluatorUsage(t *testing.T) { } } } + +func TestPersistentVolumeClaimEvaluatorMatchingResources(t *testing.T) { + evaluator := NewPersistentVolumeClaimEvaluator(nil) + testCases := map[string]struct { + items []corev1.ResourceName + want []corev1.ResourceName + }{ + "supported-resources": { + items: []corev1.ResourceName{ + "count/persistentvolumeclaims", + "requests.storage", + "persistentvolumeclaims", + "gold.storageclass.storage.k8s.io/requests.storage", + "gold.storageclass.storage.k8s.io/persistentvolumeclaims", + }, + + want: []corev1.ResourceName{ + "count/persistentvolumeclaims", + "requests.storage", + "persistentvolumeclaims", + "gold.storageclass.storage.k8s.io/requests.storage", + "gold.storageclass.storage.k8s.io/persistentvolumeclaims", + }, + }, + "unsupported-resources": { + items: []corev1.ResourceName{ + "storage", + "ephemeral-storage", + "bronze.storageclass.storage.k8s.io/storage", + "gold.storage.k8s.io/requests.storage", + }, + + want: []corev1.ResourceName{}, + }, + } + for testName, testCase := range testCases { + actual := evaluator.MatchingResources(testCase.items) + + if !reflect.DeepEqual(testCase.want, actual) { + t.Errorf("%s expected:\n%v\n, actual:\n%v", testName, testCase.want, actual) + } + + } +} From b1e7a59f84f273685719385941a0ab25c1688c36 Mon Sep 17 00:00:00 2001 From: shawnhanx Date: Wed, 19 May 2021 09:31:56 +0800 Subject: [PATCH 2/2] remove extra blank line --- pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go b/pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go index 03156639005..9c0ae121bec 100644 --- a/pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go +++ b/pkg/quota/v1/evaluator/core/persistent_volume_claims_test.go @@ -168,7 +168,6 @@ func TestPersistentVolumeClaimEvaluatorMatchingResources(t *testing.T) { "bronze.storageclass.storage.k8s.io/storage", "gold.storage.k8s.io/requests.storage", }, - want: []corev1.ResourceName{}, }, } @@ -178,6 +177,5 @@ func TestPersistentVolumeClaimEvaluatorMatchingResources(t *testing.T) { if !reflect.DeepEqual(testCase.want, actual) { t.Errorf("%s expected:\n%v\n, actual:\n%v", testName, testCase.want, actual) } - } }