github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #788 from smarterclayton/use_regular_http_in_tests

Browse Source 
httptest.NewTLSServer is ~0.2s of setup per test
This commit is contained in:
Tim Hockin 2014-08-04 23:16:00 -07:00
commit 462ce3e196
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/client/client_test.go
View File

@ -320,7 +320,7 @@ func (c *testClient) Setup() *testClient {
if responseBody := body(c.Response.Body, c.Response.RawBody); responseBody != nil { if responseBody := body(c.Response.Body, c.Response.RawBody); responseBody != nil {
c.handler.ResponseBody = *responseBody c.handler.ResponseBody = *responseBody
} }
c.server = httptest.NewTLSServer(c.handler) c.server = httptest.NewServer(c.handler)
if c.Client == nil { if c.Client == nil {
c.Client = New("", nil) c.Client = New("", nil)
} }
@ -430,7 +430,7 @@ func TestDoRequestAccepted(t *testing.T) {
ResponseBody: string(expectedBody), ResponseBody: string(expectedBody),
T: t, T: t,
} }
testServer := httptest.NewTLSServer(&fakeHandler) testServer := httptest.NewServer(&fakeHandler)
request, _ := http.NewRequest("GET", testServer.URL+"/foo/bar", nil) request, _ := http.NewRequest("GET", testServer.URL+"/foo/bar", nil)
auth := AuthInfo{User: "user", Password: "pass"} auth := AuthInfo{User: "user", Password: "pass"}
c := New(testServer.URL, &auth) c := New(testServer.URL, &auth)
@ -464,7 +464,7 @@ func TestDoRequestAcceptedSuccess(t *testing.T) {
ResponseBody: string(expectedBody), ResponseBody: string(expectedBody),
T: t, T: t,
} }
testServer := httptest.NewTLSServer(&fakeHandler) testServer := httptest.NewServer(&fakeHandler)
request, _ := http.NewRequest("GET", testServer.URL+"/foo/bar", nil) request, _ := http.NewRequest("GET", testServer.URL+"/foo/bar", nil)
auth := AuthInfo{User: "user", Password: "pass"} auth := AuthInfo{User: "user", Password: "pass"}
c := New(testServer.URL, &auth) c := New(testServer.URL, &auth)

12
pkg/client/request_test.go
View File

@ -43,7 +43,7 @@ func TestDoRequestNewWay(t *testing.T) {
ResponseBody: string(expectedBody), ResponseBody: string(expectedBody),
T: t, T: t,
} }
testServer := httptest.NewTLSServer(&fakeHandler) testServer := httptest.NewServer(&fakeHandler)
auth := AuthInfo{User: "user", Password: "pass"} auth := AuthInfo{User: "user", Password: "pass"}
s := New(testServer.URL, &auth) s := New(testServer.URL, &auth)
obj, err := s.Verb("POST"). obj, err := s.Verb("POST").
@ -81,7 +81,7 @@ func TestDoRequestNewWayReader(t *testing.T) {
ResponseBody: string(expectedBody), ResponseBody: string(expectedBody),
T: t, T: t,
} }
testServer := httptest.NewTLSServer(&fakeHandler) testServer := httptest.NewServer(&fakeHandler)
auth := AuthInfo{User: "user", Password: "pass"} auth := AuthInfo{User: "user", Password: "pass"}
s := New(testServer.URL, &auth) s := New(testServer.URL, &auth)
obj, err := s.Verb("POST"). obj, err := s.Verb("POST").
@ -121,7 +121,7 @@ func TestDoRequestNewWayObj(t *testing.T) {
ResponseBody: string(expectedBody), ResponseBody: string(expectedBody),
T: t, T: t,
} }
testServer := httptest.NewTLSServer(&fakeHandler) testServer := httptest.NewServer(&fakeHandler)
auth := AuthInfo{User: "user", Password: "pass"} auth := AuthInfo{User: "user", Password: "pass"}
s := New(testServer.URL, &auth) s := New(testServer.URL, &auth)
obj, err := s.Verb("POST"). obj, err := s.Verb("POST").
@ -174,7 +174,7 @@ func TestDoRequestNewWayFile(t *testing.T) {
ResponseBody: string(expectedBody), ResponseBody: string(expectedBody),
T: t, T: t,
} }
testServer := httptest.NewTLSServer(&fakeHandler) testServer := httptest.NewServer(&fakeHandler)
auth := AuthInfo{User: "user", Password: "pass"} auth := AuthInfo{User: "user", Password: "pass"}
s := New(testServer.URL, &auth) s := New(testServer.URL, &auth)
obj, err := s.Verb("POST"). obj, err := s.Verb("POST").
@ -266,7 +266,7 @@ func TestPolling(t *testing.T) {
} }
callNumber := 0 callNumber := 0
testServer := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
data, err := api.Encode(objects[callNumber]) data, err := api.Encode(objects[callNumber])
if err != nil { if err != nil {
t.Errorf("Unexpected encode error") t.Errorf("Unexpected encode error")
@ -360,7 +360,7 @@ func TestWatch(t *testing.T) {
} }
auth := AuthInfo{User: "user", Password: "pass"} auth := AuthInfo{User: "user", Password: "pass"}
testServer := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
checkAuth(t, auth, r) checkAuth(t, auth, r)
flusher, ok := w.(http.Flusher) flusher, ok := w.(http.Flusher)
if !ok { if !ok {