Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

etcd: fix start test goroutine leak

Browse Source
This commit is contained in:
Xiang Li 2014-07-22 22:47:24 -07:00 committed by Yicheng Qin
parent b652a0d232
commit b49cbc959b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etcd/etcd_start_test.go
View File

@ -54,7 +54,6 @@ func (g *garbageHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
func TestBadDiscoveryService(t *testing.T) { func TestBadDiscoveryService(t *testing.T) {
g := garbageHandler{t: t} g := garbageHandler{t: t}
ts := httptest.NewServer(&g) ts := httptest.NewServer(&g)
defer ts.Close()
c := config.New() c := config.New()
c.Discovery = ts.URL + "/v2/keys/_etcd/registry/1" c.Discovery = ts.URL + "/v2/keys/_etcd/registry/1"
@ -69,12 +68,13 @@ func TestBadDiscoveryService(t *testing.T) {
if !g.success { if !g.success {
t.Fatal("Discovery server never called") t.Fatal("Discovery server never called")
} }
ts.Close()
afterTest(t)
} }
func TestBadDiscoveryServiceWithAdvisedPeers(t *testing.T) { func TestBadDiscoveryServiceWithAdvisedPeers(t *testing.T) {
g := garbageHandler{t: t} g := garbageHandler{t: t}
ts := httptest.NewServer(&g) ts := httptest.NewServer(&g)
defer ts.Close()
es, hs := buildCluster(1, false) es, hs := buildCluster(1, false)
waitCluster(t, es) waitCluster(t, es)
@ -94,6 +94,8 @@ func TestBadDiscoveryServiceWithAdvisedPeers(t *testing.T) {
for i := range hs { for i := range hs {
hs[len(hs)-i-1].Close() hs[len(hs)-i-1].Close()
} }
ts.Close()
afterTest(t)
} }
func TestBootstrapByDiscoveryService(t *testing.T) { func TestBootstrapByDiscoveryService(t *testing.T) {
@ -108,6 +110,7 @@ func TestBootstrapByDiscoveryService(t *testing.T) {
destroyServer(e, h) destroyServer(e, h)
destroyServer(de, dh) destroyServer(de, dh)
afterTest(t)
} }
func TestRunByAdvisedPeers(t *testing.T) { func TestRunByAdvisedPeers(t *testing.T) {
@ -132,6 +135,7 @@ func TestRunByAdvisedPeers(t *testing.T) {
for i := range hs { for i := range hs {
hs[len(hs)-i-1].Close() hs[len(hs)-i-1].Close()
} }
afterTest(t)
} }
func TestRunByDiscoveryService(t *testing.T) { func TestRunByDiscoveryService(t *testing.T) {
@ -144,11 +148,14 @@ func TestRunByDiscoveryService(t *testing.T) {
if g := resp.StatusCode; g != http.StatusCreated { if g := resp.StatusCode; g != http.StatusCreated {
t.Fatalf("put status = %d, want %d", g, http.StatusCreated) t.Fatalf("put status = %d, want %d", g, http.StatusCreated)
} }
resp.Body.Close()
v.Set("value", dh.URL) v.Set("value", dh.URL)
resp, _ = tc.PutForm(fmt.Sprintf("%s%s%d", dh.URL, "/v2/keys/_etcd/registry/1/", de.id), v) resp, _ = tc.PutForm(fmt.Sprintf("%s%s%d", dh.URL, "/v2/keys/_etcd/registry/1/", de.id), v)
if g := resp.StatusCode; g != http.StatusCreated { if g := resp.StatusCode; g != http.StatusCreated {
t.Fatalf("put status = %d, want %d", g, http.StatusCreated) t.Fatalf("put status = %d, want %d", g, http.StatusCreated)
} }
resp.Body.Close()
c := config.New() c := config.New()
c.Discovery = dh.URL + "/v2/keys/_etcd/registry/1" c.Discovery = dh.URL + "/v2/keys/_etcd/registry/1"
@ -163,6 +170,7 @@ func TestRunByDiscoveryService(t *testing.T) {
destroyServer(e, h) destroyServer(e, h)
destroyServer(de, dh) destroyServer(de, dh)
afterTest(t)
} }
func buildServer(c *config.Config, id int64) (e *Server, h *httptest.Server, err error) { func buildServer(c *config.Config, id int64) (e *Server, h *httptest.Server, err error) {
@ -173,6 +181,7 @@ func buildServer(c *config.Config, id int64) (e *Server, h *httptest.Server, err
break break
} }
if err != nil { if err != nil {
destroyServer(e, h)
return nil, nil, err return nil, nil, err
} }
time.Sleep(10 * time.Millisecond) time.Sleep(10 * time.Millisecond)