]> Cypherpunks repositories - gostls13.git/commitdiff
net/smtp: don't call testing.T.Fatal{,f} from goroutines not running Test function
authorMikio Hara <mikioh.mikioh@gmail.com>
Fri, 27 Oct 2017 09:13:17 +0000 (18:13 +0900)
committerBrad Fitzpatrick <bradfitz@golang.org>
Wed, 1 Nov 2017 20:14:15 +0000 (20:14 +0000)
Also replaces verbs for error message from %s to %v. In general, low
level IO APIs return an error value containing non-string types and
there's no guarantee that all the types implement fmt.Stringer
interface.

Change-Id: I8a6e2a80d5c721c772a83b9556bac16556eaa771
Reviewed-on: https://go-review.googlesource.com/73931
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/net/smtp/smtp_test.go

index e050e2a9fa1e9f91fba019bf68c4f0d05360c23b..d489922597e5933cf8bfb836d3c7b0e3b376bb7e 100644 (file)
@@ -385,21 +385,21 @@ func TestNewClientWithTLS(t *testing.T) {
        if err != nil {
                ln, err = tls.Listen("tcp", "[::1]:0", &config)
                if err != nil {
-                       t.Fatalf("server: listen: %s", err)
+                       t.Fatalf("server: listen: %v", err)
                }
        }
 
        go func() {
                conn, err := ln.Accept()
                if err != nil {
-                       t.Fatalf("server: accept: %s", err)
+                       t.Errorf("server: accept: %v", err)
                        return
                }
                defer conn.Close()
 
                _, err = conn.Write([]byte("220 SIGNS\r\n"))
                if err != nil {
-                       t.Fatalf("server: write: %s", err)
+                       t.Errorf("server: write: %v", err)
                        return
                }
        }()
@@ -407,13 +407,13 @@ func TestNewClientWithTLS(t *testing.T) {
        config.InsecureSkipVerify = true
        conn, err := tls.Dial("tcp", ln.Addr().String(), &config)
        if err != nil {
-               t.Fatalf("client: dial: %s", err)
+               t.Fatalf("client: dial: %v", err)
        }
        defer conn.Close()
 
        client, err := NewClient(conn, ln.Addr().String())
        if err != nil {
-               t.Fatalf("smtp: newclient: %s", err)
+               t.Fatalf("smtp: newclient: %v", err)
        }
        if !client.tls {
                t.Errorf("client.tls Got: %t Expected: %t", client.tls, true)