github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2090 from ddysher/stop-httptest-server

Browse Source 
Stop httptest server.
This commit is contained in:
Brendan Burns 2014-10-30 21:44:53 -07:00
commit 563311071d
16 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/apiserver/apiserver_test.go
View File

@ -206,6 +206,7 @@ func TestNotFound(t *testing.T) {
"foo": &SimpleRESTStorage{},
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
for k, v := range cases {
request, err := http.NewRequest(v.Method, server.URL+v.Path, nil)
@ -227,6 +228,7 @@ func TestNotFound(t *testing.T) {
func TestVersion(t *testing.T) {
handler := Handle(map[string]RESTStorage{}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
request, err := http.NewRequest("GET", server.URL+"/version", nil)
@ -260,6 +262,7 @@ func TestSimpleList(t *testing.T) {
}
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
resp, err := http.Get(server.URL + "/prefix/version/simple")
if err != nil {
@ -282,6 +285,7 @@ func TestErrorList(t *testing.T) {
storage["simple"] = &simpleStorage
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
resp, err := http.Get(server.URL + "/prefix/version/simple")
if err != nil {
@ -306,6 +310,7 @@ func TestNonEmptyList(t *testing.T) {
storage["simple"] = &simpleStorage
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
resp, err := http.Get(server.URL + "/prefix/version/simple")
if err != nil {
@ -347,6 +352,7 @@ func TestGet(t *testing.T) {
storage["simple"] = &simpleStorage
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
resp, err := http.Get(server.URL + "/prefix/version/simple/id")
var itemOut Simple
@ -371,6 +377,7 @@ func TestGetMissing(t *testing.T) {
storage["simple"] = &simpleStorage
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
resp, err := http.Get(server.URL + "/prefix/version/simple/id")
if err != nil {
@ -389,6 +396,7 @@ func TestDelete(t *testing.T) {
storage["simple"] = &simpleStorage
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
request, err := http.NewRequest("DELETE", server.URL+"/prefix/version/simple/"+ID, nil)
@ -411,6 +419,7 @@ func TestDeleteMissing(t *testing.T) {
storage["simple"] = &simpleStorage
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
request, err := http.NewRequest("DELETE", server.URL+"/prefix/version/simple/"+ID, nil)
@ -435,6 +444,7 @@ func TestUpdate(t *testing.T) {
}
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
item := &Simple{
Other: "bar",
@ -468,6 +478,7 @@ func TestUpdateMissing(t *testing.T) {
storage["simple"] = &simpleStorage
handler := Handle(storage, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
item := &Simple{
Other: "bar",
@ -496,6 +507,7 @@ func TestCreate(t *testing.T) {
}, codec, "/prefix/version", selfLinker)
handler.(*defaultAPIServer).group.handler.asyncOpWait = 0
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
simple := &Simple{
@ -536,6 +548,7 @@ func TestCreateNotFound(t *testing.T) {
},
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
simple := &Simple{Other: "foo"}
@ -600,6 +613,7 @@ func TestSyncCreate(t *testing.T) {
"foo": &storage,
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
simple := &Simple{
@ -673,6 +687,7 @@ func TestAsyncDelayReturnsError(t *testing.T) {
handler := Handle(map[string]RESTStorage{"foo": &storage}, codec, "/prefix/version", selfLinker)
handler.(*defaultAPIServer).group.handler.asyncOpWait = time.Millisecond / 2
server := httptest.NewServer(handler)
defer server.Close()
status := expectApiStatus(t, "DELETE", fmt.Sprintf("%s/prefix/version/foo/bar", server.URL), nil, http.StatusConflict)
if status.Status != api.StatusFailure || status.Message == "" || status.Details == nil || status.Reason != api.StatusReasonAlreadyExists {
@ -696,6 +711,7 @@ func TestAsyncCreateError(t *testing.T) {
handler := Handle(map[string]RESTStorage{"foo": &storage}, codec, "/prefix/version", selfLinker)
handler.(*defaultAPIServer).group.handler.asyncOpWait = 0
server := httptest.NewServer(handler)
defer server.Close()
simple := &Simple{Other: "bar"}
data, _ := codec.Encode(simple)
@ -746,6 +762,7 @@ func TestWriteJSONDecodeError(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
writeJSON(http.StatusOK, latest.Codec, &UnregisteredAPIObject{"Undecodable"}, w)
}))
defer server.Close()
status := expectApiStatus(t, "GET", server.URL, nil, http.StatusInternalServerError)
if status.Reason != api.StatusReasonUnknown {
t.Errorf("unexpected reason %#v", status)
@ -767,6 +784,7 @@ func TestWriteRAWJSONMarshalError(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
writeRawJSON(http.StatusOK, &marshalError{errors.New("Undecodable")}, w)
}))
defer server.Close()
client := http.Client{}
resp, err := client.Get(server.URL)
if err != nil {
@ -792,6 +810,7 @@ func TestSyncCreateTimeout(t *testing.T) {
"foo": &storage,
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
simple := &Simple{Other: "foo"}
data, _ := codec.Encode(simple)
@ -825,6 +844,7 @@ func TestCORSAllowedOrigins(t *testing.T) {
allowedOriginRegexps, nil, nil, "true",
)
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
request, err := http.NewRequest("GET", server.URL+"/version", nil)

2
pkg/apiserver/handlers_test.go
View File

@ -37,6 +37,7 @@ func TestRateLimit(t *testing.T) {
}
},
)))
defer server.Close()
http.Get(server.URL)
}
}
@ -49,6 +50,7 @@ func TestReadOnly(t *testing.T) {
}
},
)))
defer server.Close()
for _, verb := range []string{"GET", "POST", "PUT", "DELETE", "CREATE"} {
req, err := http.NewRequest(verb, server.URL, nil)
if err != nil {

2
pkg/apiserver/operation_test.go
View File

@ -116,6 +116,7 @@ func TestOperationsList(t *testing.T) {
}, codec, "/prefix/version", selfLinker)
handler.(*defaultAPIServer).group.handler.asyncOpWait = 0
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
simple := &Simple{
@ -172,6 +173,7 @@ func TestOpGet(t *testing.T) {
}, codec, "/prefix/version", selfLinker)
handler.(*defaultAPIServer).group.handler.asyncOpWait = 0
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
simple := &Simple{

2
pkg/apiserver/proxy_test.go
View File

@ -156,6 +156,7 @@ func TestProxy(t *testing.T) {
}
fmt.Fprint(w, item.respBody)
}))
defer proxyServer.Close()
simpleStorage := &SimpleRESTStorage{
errors: map[string]error{},
@ -166,6 +167,7 @@ func TestProxy(t *testing.T) {
"foo": simpleStorage,
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
req, err := http.NewRequest(
item.method,

1
pkg/apiserver/redirect_test.go
View File

@ -33,6 +33,7 @@ func TestRedirect(t *testing.T) {
"foo": simpleStorage,
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
dontFollow := errors.New("don't follow")
client := http.Client{

5
pkg/apiserver/watch_test.go
View File

@ -52,6 +52,7 @@ func TestWatchWebsocket(t *testing.T) {
"foo": simpleStorage,
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
dest, _ := url.Parse(server.URL)
dest.Scheme = "ws" // Required by websocket, though the server never sees it.
@ -98,6 +99,7 @@ func TestWatchHTTP(t *testing.T) {
"foo": simpleStorage,
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
client := http.Client{}
dest, _ := url.Parse(server.URL)
@ -151,6 +153,7 @@ func TestWatchParamParsing(t *testing.T) {
"foo": simpleStorage,
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
dest, _ := url.Parse(server.URL)
dest.Path = "/prefix/version/watch/foo"
@ -222,6 +225,8 @@ func TestWatchProtocolSelection(t *testing.T) {
"foo": simpleStorage,
}, codec, "/prefix/version", selfLinker)
server := httptest.NewServer(handler)
defer server.Close()
defer server.CloseClientConnections()
client := http.Client{}
dest, _ := url.Parse(server.URL)

2
pkg/client/containerinfo_test.go
View File

@ -70,6 +70,7 @@ func testHTTPContainerInfoGetter(
t.Fatal(err)
}
}))
defer ts.Close()
hostURL, err := url.Parse(ts.URL)
if err != nil {
t.Fatal(err)
@ -170,6 +171,7 @@ func TestHTTPGetMachineInfo(t *testing.T) {
t.Fatal(err)
}
}))
defer ts.Close()
hostURL, err := url.Parse(ts.URL)
if err != nil {
t.Fatal(err)

2
pkg/client/kubelet_test.go
View File

@ -43,6 +43,7 @@ func TestHTTPKubeletClient(t *testing.T) {
ResponseBody: string(body),
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
hostURL, err := url.Parse(testServer.URL)
if err != nil {
@ -85,6 +86,7 @@ func TestHTTPKubeletClientNotFound(t *testing.T) {
ResponseBody: "Pod not found",
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
hostURL, err := url.Parse(testServer.URL)
if err != nil {

5
pkg/client/restclient_test.go
View File

@ -108,6 +108,7 @@ func TestDoRequestBearer(t *testing.T) {
T: t,
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
request, _ := http.NewRequest("GET", testServer.URL, nil)
c, err := RESTClientFor(&Config{Host: testServer.URL, BearerToken: "test"})
if err != nil {
@ -131,6 +132,7 @@ func TestDoRequestAccepted(t *testing.T) {
T: t,
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
c, err := RESTClientFor(&Config{Host: testServer.URL, Username: "test", Version: testapi.Version()})
if err != nil {
t.Fatalf("unexpected error: %v", err)
@ -164,6 +166,7 @@ func TestDoRequestAcceptedSuccess(t *testing.T) {
T: t,
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
c, err := RESTClientFor(&Config{Host: testServer.URL, Username: "user", Password: "pass", Version: testapi.Version()})
if err != nil {
t.Fatalf("unexpected error: %v", err)
@ -194,6 +197,7 @@ func TestDoRequestFailed(t *testing.T) {
T: t,
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
c, err := RESTClientFor(&Config{Host: testServer.URL})
if err != nil {
t.Fatalf("unexpected error: %v", err)
@ -221,6 +225,7 @@ func TestDoRequestCreated(t *testing.T) {
T: t,
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
c, err := RESTClientFor(&Config{Host: testServer.URL, Username: "user", Password: "pass", Version: testapi.Version()})
if err != nil {
t.Fatalf("unexpected error: %v", err)

5
pkg/controller/replication_controller_test.go
View File

@ -113,6 +113,7 @@ func TestSyncReplicationControllerDoesNothing(t *testing.T) {
ResponseBody: string(body),
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
client := client.NewOrDie(&client.Config{Host: testServer.URL, Version: testapi.Version()})
fakePodControl := FakePodControl{}
@ -133,6 +134,7 @@ func TestSyncReplicationControllerDeletes(t *testing.T) {
ResponseBody: string(body),
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
client := client.NewOrDie(&client.Config{Host: testServer.URL, Version: testapi.Version()})
fakePodControl := FakePodControl{}
@ -153,6 +155,7 @@ func TestSyncReplicationControllerCreates(t *testing.T) {
ResponseBody: string(body),
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
client := client.NewOrDie(&client.Config{Host: testServer.URL, Version: testapi.Version()})
fakePodControl := FakePodControl{}
@ -174,6 +177,7 @@ func TestCreateReplica(t *testing.T) {
ResponseBody: string(body),
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
client := client.NewOrDie(&client.Config{Host: testServer.URL, Version: testapi.Version()})
podControl := RealPodControl{
@ -306,6 +310,7 @@ func TestSynchonize(t *testing.T) {
t.Errorf("Unexpected request for %v", req.RequestURI)
})
testServer := httptest.NewServer(mux)
defer testServer.Close()
client := client.NewOrDie(&client.Config{Host: testServer.URL, Version: testapi.Version()})
manager := NewReplicationManager(client)
fakePodControl := FakePodControl{}

2
pkg/health/health_test.go
View File

@ -46,6 +46,7 @@ func TestHealthChecker(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(tt.status)
}))
defer ts.Close()
u, err := url.Parse(ts.URL)
if err != nil {
t.Errorf("Unexpected error: %v", err)
@ -114,6 +115,7 @@ func TestMuxHealthChecker(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
}))
defer ts.Close()
u, err := url.Parse(ts.URL)
if err != nil {
t.Errorf("Unexpected error: %v", err)

1
pkg/health/tcp_test.go
View File

@ -82,6 +82,7 @@ func TestTcpHealthChecker(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
}))
defer server.Close()
u, err := url.Parse(server.URL)
if err != nil {
t.Errorf("Unexpected error: %v", err)

2
pkg/kubelet/config/http_test.go
View File

@ -105,6 +105,7 @@ func TestExtractInvalidManifest(t *testing.T) {
ResponseBody: string(data),
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
ch := make(chan interface{}, 1)
c := SourceURL{testServer.URL, ch, nil}
if err := c.extractFromURL(); err == nil {
@ -171,6 +172,7 @@ func TestExtractFromHTTP(t *testing.T) {
ResponseBody: string(data),
}
testServer := httptest.NewServer(&fakeHandler)
defer testServer.Close()
ch := make(chan interface{}, 1)
c := SourceURL{testServer.URL, ch, nil}
if err := c.extractFromURL(); err != nil {

6
pkg/util/fake_handler_test.go
View File

@ -26,6 +26,7 @@ import (
func TestFakeHandlerPath(t *testing.T) {
handler := FakeHandler{}
server := httptest.NewServer(&handler)
defer server.Close()
method := "GET"
path := "/foo/bar"
body := "somebody"
@ -47,6 +48,7 @@ func TestFakeHandlerPath(t *testing.T) {
func TestFakeHandlerPathNoBody(t *testing.T) {
handler := FakeHandler{}
server := httptest.NewServer(&handler)
defer server.Close()
method := "GET"
path := "/foo/bar"
@ -77,6 +79,7 @@ func (f *fakeError) Logf(format string, args ...interface{}) {}
func TestFakeHandlerWrongPath(t *testing.T) {
handler := FakeHandler{}
server := httptest.NewServer(&handler)
defer server.Close()
method := "GET"
path := "/foo/bar"
fakeT := fakeError{}
@ -101,6 +104,7 @@ func TestFakeHandlerWrongPath(t *testing.T) {
func TestFakeHandlerWrongMethod(t *testing.T) {
handler := FakeHandler{}
server := httptest.NewServer(&handler)
defer server.Close()
method := "GET"
path := "/foo/bar"
fakeT := fakeError{}
@ -125,6 +129,7 @@ func TestFakeHandlerWrongMethod(t *testing.T) {
func TestFakeHandlerWrongBody(t *testing.T) {
handler := FakeHandler{}
server := httptest.NewServer(&handler)
defer server.Close()
method := "GET"
path := "/foo/bar"
body := "somebody"
@ -151,6 +156,7 @@ func TestFakeHandlerWrongBody(t *testing.T) {
func TestFakeHandlerNilBody(t *testing.T) {
handler := FakeHandler{}
server := httptest.NewServer(&handler)
defer server.Close()
method := "GET"
path := "/foo/bar"
body := "somebody"

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

@ -40,6 +40,7 @@ func TestCreate(t *testing.T) {
T: t,
}
server := httptest.NewServer(&handler)
defer server.Close()
client := client.NewOrDie(&client.Config{Host: server.URL, Version: testapi.Version()})
factory := ConfigFactory{client}
factory.Create()
@ -75,6 +76,7 @@ func TestCreateLists(t *testing.T) {
T: t,
}
server := httptest.NewServer(&handler)
defer server.Close()
factory.Client = client.NewOrDie(&client.Config{Host: server.URL, Version: testapi.Version()})
// This test merely tests that the correct request is made.
item.factory().List()
@ -132,6 +134,7 @@ func TestCreateWatches(t *testing.T) {
T: t,
}
server := httptest.NewServer(&handler)
defer server.Close()
factory.Client = client.NewOrDie(&client.Config{Host: server.URL, Version: testapi.Version()})
// This test merely tests that the correct request is made.
item.factory().Watch(item.rv)
@ -162,6 +165,7 @@ func TestPollMinions(t *testing.T) {
// FakeHandler musn't be sent requests other than the one you want to test.
mux.Handle("/api/"+testapi.Version()+"/minions", &handler)
server := httptest.NewServer(mux)
defer server.Close()
client := client.NewOrDie(&client.Config{Host: server.URL, Version: testapi.Version()})
cf := ConfigFactory{client}
@ -189,6 +193,7 @@ func TestDefaultErrorFunc(t *testing.T) {
// FakeHandler musn't be sent requests other than the one you want to test.
mux.Handle("/api/"+testapi.Version()+"/pods/foo", &handler)
server := httptest.NewServer(mux)
defer server.Close()
factory := ConfigFactory{client.NewOrDie(&client.Config{Host: server.URL, Version: testapi.Version()})}
queue := cache.NewFIFO()
podBackoff := podBackoff{
@ -312,6 +317,7 @@ func TestBind(t *testing.T) {
T: t,
}
server := httptest.NewServer(&handler)
defer server.Close()
client := client.NewOrDie(&client.Config{Host: server.URL, Version: testapi.Version()})
b := binder{client}

1
test/integration/client_test.go
View File

@ -47,6 +47,7 @@ func TestClient(t *testing.T) {
})
s := httptest.NewServer(m.Handler)
defer s.Close()
testCases := []string{
"v1beta1",