Merge pull request #66540 from hanxiaoshuai/fixut0724

Automatic merge from submit-queue (batch tested with PRs 66540, 66599). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. replace predicates string with corresponding const in TestDefaultPredicates **What this PR does / why we need it**: replace predicates string with corresponding const in TestDefaultPredicates. Unify with the const in func defaultPredicates(). **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #66540 from hanxiaoshuai/fixut0724
84a15d02 · Kubernetes Submit Queue · GitHub · d9f02d90 · 2c59a683 · 84a15d02
Unverified Commit 84a15d02 authored Jul 26, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 12 deletions

defaults_test.go pkg/scheduler/algorithmprovider/defaults/defaults_test.go +12 -12

No files found.
--- a/pkg/scheduler/algorithmprovider/defaults/defaults_test.go
+++ b/pkg/scheduler/algorithmprovider/defaults/defaults_test.go
@@ -67,18 +67,18 @@ func TestDefaultPriorities(t *testing.T) {

 func TestDefaultPredicates(t *testing.T) {
 	result := sets.NewString(
-		"NoVolumeZoneConflict",
-		"MaxEBSVolumeCount",
-		"MaxGCEPDVolumeCount",
-		"MaxAzureDiskVolumeCount",
-		"MatchInterPodAffinity",
-		"NoDiskConflict",
-		"GeneralPredicates",
-		"CheckNodeMemoryPressure",
-		"CheckNodeDiskPressure",
-		"CheckNodePIDPressure",
-		"CheckNodeCondition",
-		"PodToleratesNodeTaints",
+		predicates.NoVolumeZoneConflictPred,
+		predicates.MaxEBSVolumeCountPred,
+		predicates.MaxGCEPDVolumeCountPred,
+		predicates.MaxAzureDiskVolumeCountPred,
+		predicates.MatchInterPodAffinityPred,
+		predicates.NoDiskConflictPred,
+		predicates.GeneralPred,
+		predicates.CheckNodeMemoryPressurePred,
+		predicates.CheckNodeDiskPressurePred,
+		predicates.CheckNodePIDPressurePred,
+		predicates.CheckNodeConditionPred,
+		predicates.PodToleratesNodeTaintsPred,
 		predicates.CheckVolumeBindingPred,
 	)