crypto/tls: fix flakey test.

A test added in b37d2fdcc4d9 didn't work with some values of GOMAXPROCS
because the defer statements were in the wrong order: the Pipe could be
closed before the TLS Client was.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/9187047

diff --git a/src/pkg/crypto/tls/handshake_client_test.go b/src/pkg/crypto/tls/handshake_client_test.go
index 7e2bae766cd7492d8b4aaf18cf3e5fc3a4a419ac..9446a6e531e49d3efb67b02e02fba8bad79cbddb 100644 (file)
--- a/src/pkg/crypto/tls/handshake_client_test.go
+++ b/src/pkg/crypto/tls/handshake_client_test.go
@@ -84,7 +84,7 @@ func TestEmptyRecords(t *testing.T) {
        // the first application data from the server. This test ensures that
        // the empty record doesn't cause (0, nil) to be returned from
        // Conn.Read.
-       var config = *testConfig
+       config := *testConfig
        config.CipherSuites = []uint16{TLS_RSA_WITH_AES_256_CBC_SHA}
 
        c, s := net.Pipe()
@@ -92,8 +92,8 @@ func TestEmptyRecords(t *testing.T) {
        go func() {
                buf := make([]byte, 1024)
                n, err := cli.Read(buf)
-               defer cli.Close()
                defer c.Close()
+               defer cli.Close()
 
                if err != nil {
                        t.Fatalf("error reading from tls.Client: %s", err)