]> Cypherpunks repositories - gostls13.git/commitdiff
net/http: add more debugging to TestServerAllowsBlockingRemoteAddr
authorBrad Fitzpatrick <bradfitz@golang.org>
Thu, 2 Mar 2017 02:45:39 +0000 (02:45 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Thu, 2 Mar 2017 06:08:42 +0000 (06:08 +0000)
It fails on Solaris often, but nowhere else.

Not sure why. Add some debugging.

Change-Id: I79fc710bd339ae972d624c73a46bd8d215729c10
Reviewed-on: https://go-review.googlesource.com/37659
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/net/http/serve_test.go

index d74b1b120f42b822a049266fae5ee4584cbc527c..8092cc1bcbead9a5ae98c0fb4a8d626c28bf2a9a 100644 (file)
@@ -953,17 +953,17 @@ func TestServerAllowsBlockingRemoteAddr(t *testing.T) {
        defer tr.CloseIdleConnections()
        c := &Client{Transport: tr, Timeout: time.Second}
 
-       fetch := func(response chan string) {
+       fetch := func(num int, response chan<- string) {
                resp, err := c.Get(ts.URL)
                if err != nil {
-                       t.Error(err)
+                       t.Errorf("Request %d: %v", num, err)
                        response <- ""
                        return
                }
                defer resp.Body.Close()
                body, err := ioutil.ReadAll(resp.Body)
                if err != nil {
-                       t.Error(err)
+                       t.Errorf("Request %d: %v", num, err)
                        response <- ""
                        return
                }
@@ -972,14 +972,14 @@ func TestServerAllowsBlockingRemoteAddr(t *testing.T) {
 
        // Start a request. The server will block on getting conn.RemoteAddr.
        response1c := make(chan string, 1)
-       go fetch(response1c)
+       go fetch(1, response1c)
 
        // Wait for the server to accept it; grab the connection.
        conn1 := <-conns
 
        // Start another request and grab its connection
        response2c := make(chan string, 1)
-       go fetch(response2c)
+       go fetch(2, response2c)
        var conn2 net.Conn
 
        select {