From 58695365b9aeae0a97a79a1257d98ec873d3d5e2 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 14 Nov 2016 21:34:58 -0800 Subject: [PATCH] all: don't call t.Fatal from a goroutine Fixes #17900. Change-Id: I42cda6ac9cf48ed739d3a015a90b3cb15edf8ddf Reviewed-on: https://go-review.googlesource.com/33243 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- handshake_server_test.go | 3 ++- tls_test.go | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/handshake_server_test.go b/handshake_server_test.go index fa93c8a..bcd3d43 100644 --- a/handshake_server_test.go +++ b/handshake_server_test.go @@ -206,7 +206,8 @@ func TestRenegotiationExtension(t *testing.T) { buf = make([]byte, 1024) n, err := c.Read(buf) if err != nil { - t.Fatalf("Server read returned error: %s", err) + t.Errorf("Server read returned error: %s", err) + return } buf = buf[:n] c.Close() diff --git a/tls_test.go b/tls_test.go index 1a5286c..8933f4f 100644 --- a/tls_test.go +++ b/tls_test.go @@ -295,12 +295,14 @@ func TestTLSUniqueMatches(t *testing.T) { for i := 0; i < 2; i++ { sconn, err := ln.Accept() if err != nil { - t.Fatal(err) + t.Error(err) + return } serverConfig := testConfig.Clone() srv := Server(sconn, serverConfig) if err := srv.Handshake(); err != nil { - t.Fatal(err) + t.Error(err) + return } serverTLSUniques <- srv.ConnectionState().TLSUnique }