code review 45620043: go.net/ipv6: add missing API tests

ipv6/multicast_test.go

 // Copyright 2013 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 ipv6_test
 
 import (
         "bytes"
         "code.google.com/p/go.net/ipv6"
         "net"
@@ skipping 17 matching lines @@
         ifi := loopbackInterface()
         if ifi == nil {
                 t.Skipf("not available on %q", runtime.GOOS)
         }
 
         c, err := net.ListenPacket("udp6", "[ff02::114]:0") // see RFC 4727
         if err != nil {
                 t.Fatalf("net.ListenPacket failed: %v", err)
         }
         defer c.Close()
+
+        _, port, err := net.SplitHostPort(c.LocalAddr().String())
+        if err != nil {
+                t.Fatalf("net.SplitHostPort failed: %v", err)
+        }
+        dst, err := net.ResolveUDPAddr("udp6", "[ff02::114]:"+port) // see RFC 4727
+        if err != nil {
+                t.Fatalf("net.ResolveUDPAddr failed: %v", err)
+        }
+
         p := ipv6.NewPacketConn(c)
         defer p.Close()

[dave_cheney.net, 2013/12/31 10:33:22]

Why did you move this code ?

[mikio, 2013/12/31 14:25:04]

nothing, will revert.

-
-        _, port, err := net.SplitHostPort(c.LocalAddr().String())
-        if err != nil {
-                t.Fatalf("net.SplitHostPort failed: %v", err)
-        }
-        dst, err := net.ResolveUDPAddr("udp6", "[ff02::114]:"+port) // see RFC 4727
-        if err != nil {
-                t.Fatalf("net.ResolveUDPAddr failed: %v", err)
-        }
-
         if err := p.JoinGroup(ifi, dst); err != nil {
                 t.Fatalf("ipv6.PacketConn.JoinGroup on %v failed: %v", ifi, err)
         }
         if err := p.SetMulticastInterface(ifi); err != nil {
                 t.Fatalf("ipv6.PacketConn.SetMulticastInterface failed: %v", err)
         }
         if _, err := p.MulticastInterface(); err != nil {
                 t.Fatalf("ipv6.PacketConn.MulticastInterface failed: %v", err)
         }
         if err := p.SetMulticastLoopback(true); err != nil {
@@ skipping 49 matching lines @@
         ifi := loopbackInterface()
         if ifi == nil {
                 t.Skipf("not available on %q", runtime.GOOS)
         }
 
         c, err := net.ListenPacket("ip6:ipv6-icmp", "::")
         if err != nil {
                 t.Fatalf("net.ListenPacket failed: %v", err)
         }
         defer c.Close()
+
+        dst, err := net.ResolveIPAddr("ip6", "ff02::114") // see RFC 4727
+        if err != nil {
+                t.Fatalf("net.ResolveIPAddr failed: %v", err)
+        }
+
+        pshicmp := ipv6PseudoHeader(c.LocalAddr().(*net.IPAddr).IP, dst.IP, ianaProtocolIPv6ICMP)
         p := ipv6.NewPacketConn(c)
         defer p.Close()

[dave_cheney.net, 2013/12/31 10:33:22]

same

[mikio, 2013/12/31 14:25:04]

ditto

-
-        dst, err := net.ResolveIPAddr("ip6", "ff02::114") // see RFC 4727
-        if err != nil {
-                t.Fatalf("net.ResolveIPAddr failed: %v", err)
-        }
-
-        pshicmp := ipv6PseudoHeader(c.LocalAddr().(*net.IPAddr).IP, dst.IP, ianaProtocolIPv6ICMP)
         if err := p.JoinGroup(ifi, dst); err != nil {
                 t.Fatalf("ipv6.PacketConn.JoinGroup on %v failed: %v", ifi, err)
         }
         if err := p.SetMulticastInterface(ifi); err != nil {
                 t.Fatalf("ipv6.PacketConn.SetMulticastInterface failed: %v", err)
         }
         if _, err := p.MulticastInterface(); err != nil {
                 t.Fatalf("ipv6.PacketConn.MulticastInterface failed: %v", err)
         }
         if err := p.SetMulticastLoopback(true); err != nil {
@@ skipping 58 matching lines @@
                 } else {
                         t.Logf("rcvd cmsg: %v", cm)
                         if m, err := parseICMPMessage(rb[:n]); err != nil {
                                 t.Fatalf("parseICMPMessage failed: %v", err)
                         } else if m.Type != ipv6.ICMPTypeEchoReply || m.Code != 0 {
                                 t.Fatalf("got type=%v, code=%v; expected type=%v, code=%v", m.Type, m.Code, ipv6.ICMPTypeEchoReply, 0)
                         }
                 }
         }
 }