Skip to content

Commit daa220a

Browse files
rscgopherbot
authored andcommitted
cmd/go: silence TLS handshake errors during test
We don't need to see messages like "TLS handshake error: EOF" during go test. Change-Id: If6bf51e655119914f337b9e61448c99485af34f2 Reviewed-on: https://go-review.googlesource.com/c/go/+/718183 Reviewed-by: Michael Matloob <matloob@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Matloob <matloob@golang.org> Auto-Submit: Russ Cox <rsc@golang.org>
1 parent 3ae9e95 commit daa220a

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

src/cmd/go/internal/vcweb/vcstest/vcstest.go

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package vcstest
88

99
import (
10+
"bytes"
1011
"cmd/go/internal/vcs"
1112
"cmd/go/internal/vcweb"
1213
"cmd/go/internal/web/intercept"
@@ -70,7 +71,9 @@ func NewServer() (srv *Server, err error) {
7071
}
7172
}()
7273

73-
srvHTTP := httptest.NewServer(handler)
74+
srvHTTP := httptest.NewUnstartedServer(handler)
75+
srvHTTP.Config.ErrorLog = testLogger()
76+
srvHTTP.Start()
7477
httpURL, err := url.Parse(srvHTTP.URL)
7578
if err != nil {
7679
return nil, err
@@ -81,7 +84,9 @@ func NewServer() (srv *Server, err error) {
8184
}
8285
}()
8386

84-
srvHTTPS := httptest.NewTLSServer(handler)
87+
srvHTTPS := httptest.NewUnstartedServer(handler)
88+
srvHTTPS.Config.ErrorLog = testLogger()
89+
srvHTTPS.StartTLS()
8590
httpsURL, err := url.Parse(srvHTTPS.URL)
8691
if err != nil {
8792
return nil, err
@@ -115,6 +120,19 @@ func NewServer() (srv *Server, err error) {
115120
return srv, nil
116121
}
117122

123+
func testLogger() *log.Logger {
124+
return log.New(httpLogger{}, "vcweb: ", 0)
125+
}
126+
127+
type httpLogger struct{}
128+
129+
func (httpLogger) Write(b []byte) (int, error) {
130+
if bytes.Contains(b, []byte("TLS handshake error")) {
131+
return len(b), nil
132+
}
133+
return os.Stdout.Write(b)
134+
}
135+
118136
func (srv *Server) Close() error {
119137
if vcs.VCSTestRepoURL != srv.HTTP.URL {
120138
panic("vcs URL hooks modified before Close")

0 commit comments

Comments
 (0)