kris/th5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

all: don't call t.Fatal from a goroutine

Browse Source 
Fixes #17900.

Change-Id: I42cda6ac9cf48ed739d3a015a90b3cb15edf8ddf
Reviewed-on: https://go-review.googlesource.com/33243
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Ian Lance Taylor 2016-11-14 21:34:58 -08:00
parent b8725556fa
commit 58695365b9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
handshake_server_test.go
View File

@ -206,7 +206,8 @@ func TestRenegotiationExtension(t *testing.T) {
buf = make([]byte, 1024) buf = make([]byte, 1024)
n, err := c.Read(buf) n, err := c.Read(buf)
if err != nil { if err != nil {
t.Fatalf("Server read returned error: %s", err) t.Errorf("Server read returned error: %s", err)
return
} }
buf = buf[:n] buf = buf[:n]
c.Close() c.Close()

6
tls_test.go
View File

@ -295,12 +295,14 @@ func TestTLSUniqueMatches(t *testing.T) {
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
sconn, err := ln.Accept() sconn, err := ln.Accept()
if err != nil { if err != nil {
t.Fatal(err) t.Error(err)
return
} }
serverConfig := testConfig.Clone() serverConfig := testConfig.Clone()
srv := Server(sconn, serverConfig) srv := Server(sconn, serverConfig)
if err := srv.Handshake(); err != nil { if err := srv.Handshake(); err != nil {
t.Fatal(err) t.Error(err)
return
} }
serverTLSUniques <- srv.ConnectionState().TLSUnique serverTLSUniques <- srv.ConnectionState().TLSUnique
} }