github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50554 from zhangxiaoyu-zidif/refactor-factory-test

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 50257, 50247, 50665, 50554, 51077)

Refactor kubectl factory test case with sets.String

**What this PR does / why we need it**:
change to make got and want use sets.String instead, since that is both safe and more clearly shows the intent.

**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-23 02:35:11 -07:00
committed by GitHub
parent 178a5ff314 e83e799d1d
commit 617dc79311
2 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubectl/cmd/util/BUILD
View File

@@ -115,6 +115,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/version:go_default_library", "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",

33
pkg/kubectl/cmd/util/factory_test.go
View File

@@ -37,6 +37,7 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/apiserver/pkg/util/flag" "k8s.io/apiserver/pkg/util/flag"
manualfake "k8s.io/client-go/rest/fake" manualfake "k8s.io/client-go/rest/fake"
@@ -88,22 +89,16 @@ func TestPortsForObject(t *testing.T) {
}, },
} }
expected := []string{"101"} expected := sets.NewString("101")
got, err := f.PortsForObject(pod) ports, err := f.PortsForObject(pod)
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
if len(expected) != len(got) {
t.Fatalf("Ports size mismatch! Expected %d, got %d", len(expected), len(got))
}
sort.Strings(expected) got := sets.NewString(ports...)
sort.Strings(got)
for i, port := range got { if !expected.Equal(got) {
if port != expected[i] { t.Fatalf("Ports mismatch! Expected %v, got %v", expected, got)
t.Fatalf("Port mismatch! Expected %s, got %s", expected[i], port)
}
} }
} }
@@ -130,22 +125,18 @@ func TestProtocolsForObject(t *testing.T) {
}, },
} }
expected := "101/TCP,102/UDP" expected := sets.NewString("101/TCP", "102/UDP")
protocolsMap, err := f.ProtocolsForObject(pod) protocolsMap, err := f.ProtocolsForObject(pod)
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
got := kubectl.MakeProtocols(protocolsMap)
expectedSlice := strings.Split(expected, ",")
gotSlice := strings.Split(got, ",")
sort.Strings(expectedSlice) protocolsString := kubectl.MakeProtocols(protocolsMap)
sort.Strings(gotSlice) protocolsStrings := strings.Split(protocolsString, ",")
got := sets.NewString(protocolsStrings...)
for i, protocol := range gotSlice { if !expected.Equal(got) {
if protocol != expectedSlice[i] { t.Fatalf("Protocols mismatch! Expected %v, got %v", expected, got)
t.Fatalf("Protocols mismatch! Expected %s, got %s", expectedSlice[i], protocol)
}
} }
} }