code review 8011043: net: fix test data corruption in repetitive test runs b...

src/pkg/net/tcp_test.go

 // Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package net
 
 import (
         "fmt"
         "reflect"
         "runtime"
@@ skipping 129 matching lines @@
                                         break
                                 }
                         }
                 }()
         }
         for i := 0; i < cap(sem); i++ {
                 sem <- true
         }
 }
 
-var resolveTCPAddrTests = []struct {
+type resolveTCPAddrTest struct {
         net     string
         litAddr string
         addr    *TCPAddr
         err     error
-}{
+}
+
+var resolveTCPAddrTests = []resolveTCPAddrTest{
         {"tcp", "127.0.0.1:0", &TCPAddr{IP: IPv4(127, 0, 0, 1), Port: 0}, nil},
         {"tcp4", "127.0.0.1:65535", &TCPAddr{IP: IPv4(127, 0, 0, 1), Port: 65535}, nil},
 
         {"tcp", "[::1]:1", &TCPAddr{IP: ParseIP("::1"), Port: 1}, nil},
         {"tcp6", "[::1]:65534", &TCPAddr{IP: ParseIP("::1"), Port: 65534}, nil},
 
         {"tcp", "[::1%en0]:1", &TCPAddr{IP: ParseIP("::1"), Port: 1, Zone: "en0"}, nil},
         {"tcp6", "[::1%911]:2", &TCPAddr{IP: ParseIP("::1"), Port: 2, Zone: "911"}, nil},
-        {"tcp6", "[fe80::1]:3", &TCPAddr{IP: ParseIP("fe80::1"), Port: 3, Zone: "name"}, nil},
-        {"tcp6", "[fe80::1]:4", &TCPAddr{IP: ParseIP("fe80::1"), Port: 4, Zone: "index"}, nil},
 
         {"", "127.0.0.1:0", &TCPAddr{IP: IPv4(127, 0, 0, 1), Port: 0}, nil}, // Go 1.0 behavior
         {"", "[::1]:0", &TCPAddr{IP: ParseIP("::1"), Port: 0}, nil},         // Go 1.0 behavior
 
         {"http", "127.0.0.1:0", nil, UnknownNetworkError("http")},
 }
 
+func init() {
+        if ifi := loopbackInterface(); ifi != nil {
+                index := fmt.Sprintf("%v", ifi.Index)
+                resolveTCPAddrTests = append(resolveTCPAddrTests, []resolveTCPAddrTest{
+                        {"tcp6", "[fe80::1%" + ifi.Name + "]:3", &TCPAddr{IP: ParseIP("fe80::1"), Port: 3, Zone: zoneToString(ifi.Index)}, nil},
+                        {"tcp6", "[fe80::1%" + index + "]:4", &TCPAddr{IP: ParseIP("fe80::1"), Port: 4, Zone: index}, nil},
+                }...)
+        }
+}
+
 func TestResolveTCPAddr(t *testing.T) {
-        for i, tt := range resolveTCPAddrTests {
-                if tt.addr != nil && (tt.addr.Zone == "name" || tt.addr.Zone == "index") {
-                        ifi := loopbackInterface()
-                        if ifi == nil {
-                                continue
-                        }
-                        j := last(tt.litAddr, ']')
-                        if j > 0 {
-                                switch tt.addr.Zone {
-                                case "name":
-                                        resolveTCPAddrTests[i].litAddr = tt.litAddr[:j] + "%" + ifi.Name + tt.litAddr[j:]
-                                        resolveTCPAddrTests[i].addr.Zone = zoneToString(ifi.Index)
-                                case "index":
-                                        index := fmt.Sprintf("%v", ifi.Index)
-                                        resolveTCPAddrTests[i].litAddr = tt.litAddr[:j] + "%" + index + tt.litAddr[j:]
-                                        resolveTCPAddrTests[i].addr.Zone = index
-                                }
-                        }
-                }
-                addr, err := ResolveTCPAddr(tt.net, resolveTCPAddrTests[i].litAddr)
+        for _, tt := range resolveTCPAddrTests {
+                addr, err := ResolveTCPAddr(tt.net, tt.litAddr)
                 if err != tt.err {
-                        t.Fatalf("ResolveTCPAddr(%v, %v) failed: %v", tt.net, resolveTCPAddrTests[i].litAddr, err)
-                }
-                if !reflect.DeepEqual(addr, resolveTCPAddrTests[i].addr) {
-                        t.Fatalf("got %#v; expected %#v", addr, resolveTCPAddrTests[i].addr)
+                        t.Fatalf("ResolveTCPAddr(%v, %v) failed: %v", tt.net, tt.litAddr, err)
+                }
+                if !reflect.DeepEqual(addr, tt.addr) {
+                        t.Fatalf("got %#v; expected %#v", addr, tt.addr)
                 }
         }
 }
 
 var tcpListenerNameTests = []struct {
         net   string
         laddr *TCPAddr
 }{
         {"tcp4", &TCPAddr{IP: IPv4(127, 0, 0, 1)}},
         {"tcp4", &TCPAddr{}},
@@ skipping 86 matching lines @@
                         t.Fatalf("Conn.Write failed: %v", err)
                 }
                 b := make([]byte, 32)
                 if _, err := c.Read(b); err != nil {
                         t.Fatalf("Conn.Read failed: %v", err)
                 }
 
                 <-done
         }
 }