github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2017-08-17 18:12:07 -07:00 committed by GitHub
commit f0066597ca
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/statefulset/BUILD
View File

@ -70,6 +70,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime: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/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:go_default_library",
"//vendor/k8s.io/client-go/informers/apps/v1beta1: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", "//vendor/k8s.io/client-go/informers/core/v1:go_default_library",

23
pkg/controller/statefulset/stateful_set_test.go
View File

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