github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77670 from bjhaid/cleanup_pkg_api

Browse Source 
Clean up pkg/api.
This commit is contained in:
Kubernetes Prow Robot 2019-05-10 21:31:02 -07:00 committed by GitHub
commit 74c0c21f80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/service/util_test.go
View File

@ -53,13 +53,13 @@ func TestGetLoadBalancerSourceRanges(t *testing.T) {
annotations[api.AnnotationLoadBalancerSourceRangesKey] = v annotations[api.AnnotationLoadBalancerSourceRangesKey] = v
svc := api.Service{} svc := api.Service{}
svc.Annotations = annotations svc.Annotations = annotations
cidrs, err := GetLoadBalancerSourceRanges(&svc) _, err := GetLoadBalancerSourceRanges(&svc)
if err != nil { if err != nil {
t.Errorf("Unexpected error parsing: %q", v) t.Errorf("Unexpected error parsing: %q", v)
} }
svc = api.Service{} svc = api.Service{}
svc.Spec.LoadBalancerSourceRanges = strings.Split(v, ",") svc.Spec.LoadBalancerSourceRanges = strings.Split(v, ",")
cidrs, err = GetLoadBalancerSourceRanges(&svc) cidrs, err := GetLoadBalancerSourceRanges(&svc)
if err != nil { if err != nil {
t.Errorf("Unexpected error parsing: %q", v) t.Errorf("Unexpected error parsing: %q", v)
} }

2
pkg/api/testing/copy_test.go
View File

@ -69,7 +69,7 @@ func doDeepCopyTest(t *testing.T, kind schema.GroupVersionKind, f *fuzz.Fuzzer)
return return
} }
if bytes.Compare(prefuzzData.Bytes(), postfuzzData.Bytes()) != 0 { if !bytes.Equal(prefuzzData.Bytes(), postfuzzData.Bytes()) {
t.Log(diff.StringDiff(prefuzzData.String(), postfuzzData.String())) t.Log(diff.StringDiff(prefuzzData.String(), postfuzzData.String()))
t.Errorf("Fuzzing copy modified original of %#v", kind) t.Errorf("Fuzzing copy modified original of %#v", kind)
return return

2
pkg/api/testing/serialization_test.go
View File

@ -387,7 +387,7 @@ func TestObjectWatchFraming(t *testing.T) {
} }
sr = streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s) sr = streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s)
outEvent := &metav1.WatchEvent{} outEvent := &metav1.WatchEvent{}
res, _, err = sr.Decode(nil, outEvent) _, _, err = sr.Decode(nil, outEvent)
if err != nil || outEvent.Type != string(watch.Added) { if err != nil || outEvent.Type != string(watch.Added) {
t.Fatalf("%v: %#v", err, outEvent) t.Fatalf("%v: %#v", err, outEvent)
} }

3
pkg/api/v1/pod/util_test.go
View File

@ -604,8 +604,7 @@ func TestUpdatePodCondition(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
var resultStatus bool resultStatus := UpdatePodCondition(test.status, &test.conditions)
resultStatus = UpdatePodCondition(test.status, &test.conditions)
assert.Equal(t, test.expected, resultStatus, test.desc) assert.Equal(t, test.expected, resultStatus, test.desc)
} }

4
pkg/api/v1/service/util_test.go
View File

@ -53,13 +53,13 @@ func TestGetLoadBalancerSourceRanges(t *testing.T) {
annotations[v1.AnnotationLoadBalancerSourceRangesKey] = v annotations[v1.AnnotationLoadBalancerSourceRangesKey] = v
svc := v1.Service{} svc := v1.Service{}
svc.Annotations = annotations svc.Annotations = annotations
cidrs, err := GetLoadBalancerSourceRanges(&svc) _, err := GetLoadBalancerSourceRanges(&svc)
if err != nil { if err != nil {
t.Errorf("Unexpected error parsing: %q", v) t.Errorf("Unexpected error parsing: %q", v)
} }
svc = v1.Service{} svc = v1.Service{}
svc.Spec.LoadBalancerSourceRanges = strings.Split(v, ",") svc.Spec.LoadBalancerSourceRanges = strings.Split(v, ",")
cidrs, err = GetLoadBalancerSourceRanges(&svc) cidrs, err := GetLoadBalancerSourceRanges(&svc)
if err != nil { if err != nil {
t.Errorf("Unexpected error parsing: %q", v) t.Errorf("Unexpected error parsing: %q", v)
} }