Merge pull request #50220 from zhangxiaoyu-zidif/delete-statefulset-test-redundant-sort

Automatic merge from submit-queue (batch tested with PRs 50536, 50809, 50220, 50399, 50176) Refactor statefulset test with sets.String **What this PR does / why we need it**: Delete redundant sort. These string slices only own one element. There is no necessary to sort them. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #50220 from zhangxiaoyu-zidif/delete-statefulset-test-redundant-sort
f0066597 · Kubernetes Submit Queue · GitHub · 2210065d · 3393cf47 · f0066597
Commit f0066597 authored Aug 17, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 14 deletions

BUILD pkg/controller/statefulset/BUILD +1 -0

stateful_set_test.go pkg/controller/statefulset/stateful_set_test.go +9 -14

No files found.
--- a/pkg/controller/statefulset/BUILD
+++ b/pkg/controller/statefulset/BUILD
@@ -70,6 +70,7 @@ go_test(
        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
        "//vendor/k8s.io/client-go/informers:go_default_library",
        "//vendor/k8s.io/client-go/informers/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/informers/core/v1:go_default_library",

--- a/pkg/controller/statefulset/stateful_set_test.go
+++ b/pkg/controller/statefulset/stateful_set_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package statefulset

 import (
-	"reflect"
 	"sort"
 	"testing"

@@ -25,6 +24,7 @@ import (
 	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
@@ -521,16 +521,13 @@ func TestGetPodsForStatefulSetAdopt(t *testing.T) {
 	if err != nil {
 		t.Fatalf("getPodsForStatefulSet() error: %v", err)
 	}
-	var got []string
+	got := sets.NewString()
 	for _, pod := range pods {
-		got = append(got, pod.Name)
+		got.Insert(pod.Name)
 	}
-
 	// pod2 should be claimed, pod3 and pod4 ignored
-	want := []string{pod1.Name, pod2.Name}
-	sort.Strings(got)
-	sort.Strings(want)
-	if !reflect.DeepEqual(got, want) {
+	want := sets.NewString(pod1.Name, pod2.Name)
+	if !got.Equal(want) {
 		t.Errorf("getPodsForStatefulSet() = %v, want %v", got, want)
 	}
 }
@@ -561,16 +558,14 @@ func TestGetPodsForStatefulSetRelease(t *testing.T) {
 	if err != nil {
 		t.Fatalf("getPodsForStatefulSet() error: %v", err)
 	}
-	var got []string
+	got := sets.NewString()
 	for _, pod := range pods {
-		got = append(got, pod.Name)
+		got.Insert(pod.Name)
 	}

 	// Expect only pod1 (pod2 and pod3 should be released, pod4 ignored).
-	want := []string{pod1.Name}
-	sort.Strings(got)
-	sort.Strings(want)
-	if !reflect.DeepEqual(got, want) {
+	want := sets.NewString(pod1.Name)
+	if !got.Equal(want) {
 		t.Errorf("getPodsForStatefulSet() = %v, want %v", got, want)
 	}
 }