Commit a8e0035b authored by David Symonds's avatar David Symonds

http: drain the pipe output in TestHandlerPanic to avoid logging deadlock.

R=r
CC=golang-dev
https://golang.org/cl/4756047
parent 08e47ebb
...@@ -820,6 +820,7 @@ func TestHandlerPanic(t *testing.T) { ...@@ -820,6 +820,7 @@ func TestHandlerPanic(t *testing.T) {
go func() { go func() {
buf := make([]byte, 1024) buf := make([]byte, 1024)
_, err := pr.Read(buf) _, err := pr.Read(buf)
pr.Close()
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
...@@ -829,7 +830,7 @@ func TestHandlerPanic(t *testing.T) { ...@@ -829,7 +830,7 @@ func TestHandlerPanic(t *testing.T) {
case <-done: case <-done:
return return
case <-time.After(5e9): case <-time.After(5e9):
t.Error("expected server handler to log an error") t.Fatal("expected server handler to log an error")
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment