code review 7627048: net: use original raddr if getpeername fails

src/pkg/net/ipraw_test.go

 // Copyright 2009 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 (
         "bytes"
         "errors"
         "os"
@@ skipping 29 matching lines @@
                 addr, err := ResolveIPAddr(tt.net, tt.litAddr)
                 if err != tt.err {
                         t.Fatalf("ResolveIPAddr(%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 ipConnLocalNameTests = []struct {

[rsc, 2013/03/22 14:31:09]

It's very disorienting to review code when big blocks move within the file.
Codereview is not showing me what's different, and people going through the hg
history later will not be able to see the differences either.

Please move this back to the end of the file so that diffs are clearer.

Thanks.

[mikio, 2013/03/23 00:01:22]

Done.

+        net   string
+        laddr *IPAddr
+}{
+        {"ip4:icmp", &IPAddr{IP: IPv4(127, 0, 0, 1)}},
+        {"ip4:icmp", &IPAddr{}},
+        {"ip4:icmp", nil},
+}
+
+func TestIPConnLocalName(t *testing.T) {
+        if os.Getuid() != 0 {
+                t.Skip("skipping test; must be root")
+        }
+
+        for _, tt := range ipConnLocalNameTests {
+                c, err := ListenIP(tt.net, tt.laddr)
+                if err != nil {
+                        t.Fatalf("ListenIP failed: %v", err)
+                }
+                defer c.Close()
+                if la := c.LocalAddr(); la == nil {
+                        t.Fatal("IPConn.LocalAddr failed")
+                }
+        }
+}
+
+func TestIPConnRemoteName(t *testing.T) {
+        if os.Getuid() != 0 {
+                t.Skip("skipping test; must be root")
+        }
+
+        raddr := &IPAddr{IP: IPv4(127, 0, 0, 10).To4()}
+        c, err := DialIP("ip:tcp", &IPAddr{IP: IPv4(127, 0, 0, 1)}, raddr)
+        if err != nil {
+                t.Fatalf("DialIP failed: %v", err)
+        }
+        defer c.Close()
+        if !reflect.DeepEqual(raddr, c.RemoteAddr()) {
+                t.Fatalf("got %#v, expected %#v", c.RemoteAddr(), raddr)
+        }
+}
+
 var icmpEchoTests = []struct {
         net   string
         laddr string
         raddr string
 }{
         {"ip4:icmp", "0.0.0.0", "127.0.0.1"},
         {"ip6:ipv6-icmp", "::", "::1"},
 }
 
 func TestConnICMPEcho(t *testing.T) {
@@ skipping 244 matching lines @@
 // body.
 func parseICMPEcho(b []byte) (*icmpEcho, error) {
         bodylen := len(b)
         p := &icmpEcho{ID: int(b[0])<<8 | int(b[1]), Seq: int(b[2])<<8 | int(b[3])}
         if bodylen > 4 {
                 p.Data = make([]byte, bodylen-4)
                 copy(p.Data, b[4:])
         }
         return p, nil
 }
-
-var ipConnLocalNameTests = []struct {
-        net   string
-        laddr *IPAddr
-}{
-        {"ip4:icmp", &IPAddr{IP: IPv4(127, 0, 0, 1)}},
-        {"ip4:icmp", &IPAddr{}},
-        {"ip4:icmp", nil},
-}
-
-func TestIPConnLocalName(t *testing.T) {
-        if os.Getuid() != 0 {
-                t.Skip("skipping test; must be root")
-        }
-
-        for _, tt := range ipConnLocalNameTests {
-                c, err := ListenIP(tt.net, tt.laddr)
-                if err != nil {
-                        t.Fatalf("ListenIP failed: %v", err)
-                }
-                defer c.Close()
-                if la := c.LocalAddr(); la == nil {
-                        t.Fatal("IPConn.LocalAddr failed")
-                }
-        }
-}
-
-func TestIPConnRemoteName(t *testing.T) {
-        if os.Getuid() != 0 {
-                t.Skip("skipping test; must be root")
-        }
-
-        raddr := &IPAddr{IP: IPv4(127, 0, 0, 10).To4()}
-        c, err := DialIP("ip:tcp", &IPAddr{IP: IPv4(127, 0, 0, 1)}, raddr)
-        if err != nil {
-                t.Fatalf("DialIP failed: %v", err)
-        }
-        defer c.Close()
-        if !reflect.DeepEqual(raddr, c.RemoteAddr()) {
-                t.Fatalf("got %#v, expected %#v", c.RemoteAddr(), raddr)
-        }
-}