github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3181 from smarterclayton/cleanup_http_items

Browse Source 
Minor cleanups to request - fix initialism on HTTPClientFunc
This commit is contained in:
Daniel Smith 2014-12-30 17:34:00 -08:00
commit 9c2cd55528
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/fake.go
View File

@ -80,9 +80,9 @@ func (c *Fake) ServerAPIVersions() (*api.APIVersions, error) {
return &api.APIVersions{Versions: []string{"v1beta1", "v1beta2"}}, nil return &api.APIVersions{Versions: []string{"v1beta1", "v1beta2"}}, nil
} }
type HttpClientFunc func(*http.Request) (*http.Response, error) type HTTPClientFunc func(*http.Request) (*http.Response, error)
func (f HttpClientFunc) Do(req *http.Request) (*http.Response, error) { func (f HTTPClientFunc) Do(req *http.Request) (*http.Response, error) {
return f(req) return f(req)
} }

3
pkg/client/request.go
View File

@ -226,6 +226,9 @@ func (r *Request) SelectorParam(paramName string, s labels.Selector) *Request {
if r.err != nil { if r.err != nil {
return r return r
} }
if s.Empty() {
return r
}
return r.setParam(paramName, s.String()) return r.setParam(paramName, s.String())
} }

4
pkg/kubectl/resthelper_test.go
View File

@ -125,7 +125,7 @@ func TestRESTHelperCreate(t *testing.T) {
tests := []struct { tests := []struct {
Resp *http.Response Resp *http.Response
RespFunc client.HttpClientFunc RespFunc client.HTTPClientFunc
HttpErr error HttpErr error
Modify bool Modify bool
Object runtime.Object Object runtime.Object
@ -299,7 +299,7 @@ func TestRESTHelperUpdate(t *testing.T) {
tests := []struct { tests := []struct {
Resp *http.Response Resp *http.Response
RespFunc client.HttpClientFunc RespFunc client.HTTPClientFunc
HttpErr error HttpErr error
Overwrite bool Overwrite bool
Object runtime.Object Object runtime.Object

8
plugin/pkg/scheduler/factory/factory_test.go
View File

@ -55,7 +55,7 @@ func TestCreateLists(t *testing.T) {
}{ }{
// Minion // Minion
{ {
location: "/api/" + testapi.Version() + "/minions?fields=", location: "/api/" + testapi.Version() + "/minions",
factory: factory.createMinionLW, factory: factory.createMinionLW,
}, },
// Assigned pod // Assigned pod
@ -95,15 +95,15 @@ func TestCreateWatches(t *testing.T) {
// Minion watch // Minion watch
{ {
rv: "", rv: "",
location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=", location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=",
factory: factory.createMinionLW, factory: factory.createMinionLW,
}, { }, {
rv: "0", rv: "0",
location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=0", location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=0",
factory: factory.createMinionLW, factory: factory.createMinionLW,
}, { }, {
rv: "42", rv: "42",
location: "/api/" + testapi.Version() + "/watch/minions?fields=&resourceVersion=42", location: "/api/" + testapi.Version() + "/watch/minions?resourceVersion=42",
factory: factory.createMinionLW, factory: factory.createMinionLW,
}, },
// Assigned pod watches // Assigned pod watches