From 3393cf4718d5880fc9dc59b0f099f4c2e854e3f4 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Thu, 17 Aug 2017 06:00:02 +0800 Subject: [PATCH] fix-review --- pkg/controller/statefulset/BUILD | 1 + .../statefulset/stateful_set_test.go | 23 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/pkg/controller/statefulset/BUILD b/pkg/controller/statefulset/BUILD index bfb3e41ab65..e1eb7f8b426 100644 --- a/pkg/controller/statefulset/BUILD +++ b/pkg/controller/statefulset/BUILD @@ -74,6 +74,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", diff --git a/pkg/controller/statefulset/stateful_set_test.go b/pkg/controller/statefulset/stateful_set_test.go index ce1ff1bed1a..5814b8b8487 100644 --- 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) } }