Commit a5166a95 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick

net/http: fix test failure on some Windows machines

The network connection dies differently from the server's
perspective on (some) Windows when the client goes away. Match
on the common prefix (common to Unix and Windows) instead of
the network error part.

Fixes #7456

LGTM=josharian
R=golang-codereviews, josharian
CC=alex.brainman, golang-codereviews, iant
https://golang.org/cl/70010050
parent f884e15a
...@@ -671,8 +671,8 @@ func TestClientWithIncorrectTLSServerName(t *testing.T) { ...@@ -671,8 +671,8 @@ func TestClientWithIncorrectTLSServerName(t *testing.T) {
} }
select { select {
case v := <-errc: case v := <-errc:
if !strings.Contains(v, "bad certificate") { if !strings.Contains(v, "TLS handshake error") {
t.Errorf("expected an error log message containing 'bad certificate'; got %q", v) t.Errorf("expected an error log message containing 'TLS handshake error'; got %q", v)
} }
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.Errorf("timeout waiting for logged error") t.Errorf("timeout waiting for logged 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