]> Cypherpunks repositories - gostls13.git/commitdiff
crypto/tls: don't log expected errors in test
authorTamir Duberstein <tamird@gmail.com>
Fri, 26 Feb 2016 23:26:04 +0000 (18:26 -0500)
committerBrad Fitzpatrick <bradfitz@golang.org>
Sun, 28 Feb 2016 20:36:38 +0000 (20:36 +0000)
This is minor cleanup that reduces test output noise.

Change-Id: Ib6db4daf8cb67b7784b2d5b222fa37c7f78a6a04
Reviewed-on: https://go-review.googlesource.com/19997
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/crypto/tls/handshake_server_test.go

index e25bfa5170049a058b2533ea8b4a57c92f6beb8d..74ad72a848032d64095c90528c6fc898521b6fb0 100644 (file)
@@ -518,16 +518,17 @@ func (test *serverTest) run(t *testing.T, write bool) {
        server := Server(serverConn, config)
        connStateChan := make(chan ConnectionState, 1)
        go func() {
-               var err error
-               if _, err = server.Write([]byte("hello, world\n")); err != nil {
-                       t.Logf("Error from Server.Write: %s", err)
-               }
+               _, err := server.Write([]byte("hello, world\n"))
                if len(test.expectHandshakeErrorIncluding) > 0 {
                        if err == nil {
                                t.Errorf("Error expected, but no error returned")
                        } else if s := err.Error(); !strings.Contains(s, test.expectHandshakeErrorIncluding) {
                                t.Errorf("Error expected containing '%s' but got '%s'", test.expectHandshakeErrorIncluding, s)
                        }
+               } else {
+                       if err != nil {
+                               t.Logf("Error from Server.Write: '%s'", err)
+                       }
                }
                server.Close()
                serverConn.Close()