From 09939cf6bc91319ecef7e27be68dcbc134fad650 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 19 Jan 2015 21:18:35 +0900 Subject: [PATCH] integration: Code cleanup Don't close channel to avoid potential write-after-close. Use time.After instead of time.NewTimer --- integration-tests/server_tester.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/integration-tests/server_tester.go b/integration-tests/server_tester.go index c7ecb53d..0b14519f 100644 --- a/integration-tests/server_tester.go +++ b/integration-tests/server_tester.go @@ -111,8 +111,6 @@ func (st *serverTester) Close() { if st.ts != nil { st.ts.Close() } - close(st.frCh) - close(st.errCh) } func (st *serverTester) readFrame() (http2.Frame, error) { @@ -125,14 +123,12 @@ func (st *serverTester) readFrame() (http2.Frame, error) { st.frCh <- f }() - t := time.NewTimer(2 * time.Second) - defer t.Stop() select { case f := <-st.frCh: return f, nil case err := <-st.errCh: return nil, err - case <-t.C: + case <-time.After(2 * time.Second): return nil, errors.New("timeout waiting for frame") } }