github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-06-27 15:39:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86660 from qianlei90/fix_test

Browse Source 
remove unnecessary code in client-go test

Kubernetes-commit: 65ef5dcc513ccfd60436bf4d04652224c9b6036f
This commit is contained in:
Kubernetes Publisher 2020-01-02 23:39:40 -08:00
commit 787fa2adce
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
discovery/helper_blackbox_test.go
View File

@ -26,13 +26,12 @@ import (
"strings" "strings"
"testing" "testing"
"k8s.io/api/core/v1" 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/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/discovery" "k8s.io/client-go/discovery"
"k8s.io/client-go/kubernetes/scheme"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
) )
@ -82,23 +81,16 @@ func TestServerSupportsVersion(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
fakeClient := &fake.RESTClient{ fakeClient := fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
NegotiatedSerializer: scheme.Codecs, if test.sendErr != nil {
Resp: &http.Response{ return nil, test.sendErr
StatusCode: test.statusCode, }
Body: objBody(&metav1.APIVersions{Versions: test.serverVersions}), header := http.Header{}
}, header.Set("Content-Type", runtime.ContentTypeJSON)
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { return &http.Response{StatusCode: test.statusCode, Header: header, Body: objBody(&metav1.APIVersions{Versions: test.serverVersions})}, nil
if test.sendErr != nil { })
return nil, test.sendErr
}
header := http.Header{}
header.Set("Content-Type", runtime.ContentTypeJSON)
return &http.Response{StatusCode: test.statusCode, Header: header, Body: objBody(&metav1.APIVersions{Versions: test.serverVersions})}, nil
}),
}
c := discovery.NewDiscoveryClientForConfigOrDie(&restclient.Config{}) c := discovery.NewDiscoveryClientForConfigOrDie(&restclient.Config{})
c.RESTClient().(*restclient.RESTClient).Client = fakeClient.Client c.RESTClient().(*restclient.RESTClient).Client = fakeClient
err := discovery.ServerSupportsVersion(c, test.requiredVersion) err := discovery.ServerSupportsVersion(c, test.requiredVersion)
if err == nil && test.expectErr != nil { if err == nil && test.expectErr != nil {
t.Errorf("expected error, got nil for [%s].", test.name) t.Errorf("expected error, got nil for [%s].", test.name)