Merge pull request #20123 from brendandburns/flake3

Disable closing of the httptest Server due to https://github.com/golang/go/issues/12262
This commit is contained in:
Dawn Chen 2016-01-25 16:22:23 -08:00
commit 19ef0779f1

View File

@ -155,7 +155,8 @@ func (m *EtcdTestServer) Terminate(t *testing.T) {
time.Sleep(250 * time.Millisecond)
for _, hs := range m.hss {
hs.CloseClientConnections()
hs.Close()
// TODO: Uncomment when fix #19254
// hs.Close()
}
if err := os.RemoveAll(m.ServerConfig.DataDir); err != nil {
t.Fatal(err)