code review 7308058: net: add unixgram dial test

src/pkg/net/packetconn_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_test
+// This file implements API tests across platforms and will never have a build
+// tag.
+
+package net
 
 import (
-        "net"
         "os"
         "runtime"
         "strings"
         "testing"
         "time"
 )
 
 var packetConnTests = []struct {
         net   string
         addr1 string
         addr2 string
 }{
         {"udp", "127.0.0.1:0", "127.0.0.1:0"},
         {"ip:icmp", "127.0.0.1", "127.0.0.1"},
         {"unixgram", testUnixAddr(), testUnixAddr()},
 }
 
 func TestPacketConn(t *testing.T) {
-        closer := func(c net.PacketConn, net, addr1, addr2 string) {
+        closer := func(c PacketConn, net, addr1, addr2 string) {
                 c.Close()
                 switch net {
                 case "unixgram":
                         os.Remove(addr1)
                         os.Remove(addr2)
                 }
         }
 
-        for _, tt := range packetConnTests {
+        for i, tt := range packetConnTests {
                 var wb []byte
                 netstr := strings.Split(tt.net, ":")
                 switch netstr[0] {
                 case "udp":
                         wb = []byte("UDP PACKETCONN TEST")
                 case "ip":
                         switch runtime.GOOS {
                         case "plan9":
                                 continue
                         }
                         if os.Getuid() != 0 {
                                 continue
                         }
-                        id := os.Getpid() & 0xffff
-                        wb = newICMPEchoRequest(id, 1, 128, []byte("IP PACKETCONN TEST"))
+                        var err error
+                        wb, err = (&icmpMessage{
+                                Type: icmpv4EchoRequest, Code: 0,
+                                Body: &icmpEcho{
+                                        ID: os.Getpid() & 0xffff, Seq: i + 1,
+                                        Data: []byte("IP PACKETCONN TEST"),
+                                },
+                        }).Marshal()
+                        if err != nil {
+                                t.Fatalf("icmpMessage.Marshal failed: %v", err)
+                        }
                 case "unixgram":
                         switch runtime.GOOS {
                         case "plan9", "windows":
                                 continue
                         }
                         wb = []byte("UNIXGRAM PACKETCONN TEST")
                 default:
                         continue
                 }
 
-                c1, err := net.ListenPacket(tt.net, tt.addr1)
+                c1, err := ListenPacket(tt.net, tt.addr1)
                 if err != nil {
-                        t.Fatalf("net.ListenPacket failed: %v", err)
+                        t.Fatalf("ListenPacket failed: %v", err)
                 }
+                defer closer(c1, netstr[0], tt.addr1, tt.addr2)
                 c1.LocalAddr()
                 c1.SetDeadline(time.Now().Add(100 * time.Millisecond))
                 c1.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
                 c1.SetWriteDeadline(time.Now().Add(100 * time.Millisecond))
-                defer closer(c1, netstr[0], tt.addr1, tt.addr2)
 
-                c2, err := net.ListenPacket(tt.net, tt.addr2)
+                c2, err := ListenPacket(tt.net, tt.addr2)
                 if err != nil {
-                        t.Fatalf("net.ListenPacket failed: %v", err)
+                        t.Fatalf("ListenPacket failed: %v", err)
                 }
+                defer closer(c2, netstr[0], tt.addr1, tt.addr2)
                 c2.LocalAddr()
                 c2.SetDeadline(time.Now().Add(100 * time.Millisecond))
                 c2.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
                 c2.SetWriteDeadline(time.Now().Add(100 * time.Millisecond))
-                defer closer(c2, netstr[0], tt.addr1, tt.addr2)
 
                 if _, err := c1.WriteTo(wb, c2.LocalAddr()); err != nil {
-                        t.Fatalf("net.PacketConn.WriteTo failed: %v", err)
+                        t.Fatalf("PacketConn.WriteTo failed: %v", err)
                 }
                 rb2 := make([]byte, 128)
                 if _, _, err := c2.ReadFrom(rb2); err != nil {
-                        t.Fatalf("net.PacketConn.ReadFrom failed: %v", err)
+                        t.Fatalf("PacketConn.ReadFrom failed: %v", err)
                 }
                 if _, err := c2.WriteTo(wb, c1.LocalAddr()); err != nil {
-                        t.Fatalf("net.PacketConn.WriteTo failed: %v", err)
+                        t.Fatalf("PacketConn.WriteTo failed: %v", err)
                 }
                 rb1 := make([]byte, 128)
                 if _, _, err := c1.ReadFrom(rb1); err != nil {
-                        t.Fatalf("net.PacketConn.ReadFrom failed: %v", err)
+                        t.Fatalf("PacketConn.ReadFrom failed: %v", err)
                 }
         }
 }
 
 func TestConnAndPacketConn(t *testing.T) {
-        closer := func(c net.PacketConn, net, addr1, addr2 string) {
+        closer := func(c PacketConn, net, addr1, addr2 string) {
                 c.Close()
                 switch net {
                 case "unixgram":
                         os.Remove(addr1)
                         os.Remove(addr2)
                 }
         }
 
-        for _, tt := range packetConnTests {
+        for i, tt := range packetConnTests {
                 var wb []byte
                 netstr := strings.Split(tt.net, ":")
                 switch netstr[0] {
                 case "udp":
                         wb = []byte("UDP PACKETCONN TEST")
                 case "ip":
                         switch runtime.GOOS {
                         case "plan9":
                                 continue
                         }
                         if os.Getuid() != 0 {
                                 continue
                         }
-                        id := os.Getpid() & 0xffff
-                        wb = newICMPEchoRequest(id, 1, 128, []byte("IP PACKETCONN TEST"))
+                        var err error
+                        wb, err = (&icmpMessage{
+                                Type: icmpv4EchoRequest, Code: 0,
+                                Body: &icmpEcho{
+                                        ID: os.Getpid() & 0xffff, Seq: i + 1,
+                                        Data: []byte("IP PACKETCONN TEST"),
+                                },
+                        }).Marshal()
+                        if err != nil {
+                                t.Fatalf("icmpMessage.Marshal failed: %v", err)
+                        }
                 case "unixgram":
                         wb = []byte("UNIXGRAM PACKETCONN TEST")
                 default:
                         continue
                 }
 
-                c1, err := net.ListenPacket(tt.net, tt.addr1)
+                c1, err := ListenPacket(tt.net, tt.addr1)
                 if err != nil {
-                        t.Fatalf("net.ListenPacket failed: %v", err)
+                        t.Fatalf("ListenPacket failed: %v", err)
                 }
+                defer closer(c1, netstr[0], tt.addr1, tt.addr2)
                 c1.LocalAddr()
                 c1.SetDeadline(time.Now().Add(100 * time.Millisecond))
                 c1.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
                 c1.SetWriteDeadline(time.Now().Add(100 * time.Millisecond))
-                defer closer(c1, netstr[0], tt.addr1, tt.addr2)

[dave_cheney.net, 2013/02/19 02:02:57]

see previous comment

[mikio, 2013/03/03 07:00:04]

Done.

 
-                c2, err := net.Dial(tt.net, c1.LocalAddr().String())
+                c2, err := Dial(tt.net, c1.LocalAddr().String())
                 if err != nil {
-                        t.Fatalf("net.Dial failed: %v", err)
+                        t.Fatalf("Dial failed: %v", err)
                 }
+                defer c2.Close()
                 c2.LocalAddr()
                 c2.RemoteAddr()
                 c2.SetDeadline(time.Now().Add(100 * time.Millisecond))
                 c2.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
                 c2.SetWriteDeadline(time.Now().Add(100 * time.Millisecond))
-                defer c2.Close()

[dave_cheney.net, 2013/02/19 02:02:57]

same

 
                 if _, err := c2.Write(wb); err != nil {
-                        t.Fatalf("net.Conn.Write failed: %v", err)
+                        t.Fatalf("Conn.Write failed: %v", err)
                 }
                 rb1 := make([]byte, 128)
                 if _, _, err := c1.ReadFrom(rb1); err != nil {
-                        t.Fatalf("net.PacetConn.ReadFrom failed: %v", err)
+                        t.Fatalf("PacetConn.ReadFrom failed: %v", err)
                 }
-                var dst net.Addr
+                var dst Addr
                 switch netstr[0] {
                 case "ip":
-                        dst = &net.IPAddr{IP: net.IPv4(127, 0, 0, 1)}
+                        dst = &IPAddr{IP: IPv4(127, 0, 0, 1)}
                 case "unixgram":
                         continue
                 default:
                         dst = c2.LocalAddr()
                 }
                 if _, err := c1.WriteTo(wb, dst); err != nil {
-                        t.Fatalf("net.PacketConn.WriteTo failed: %v", err)
+                        t.Fatalf("PacketConn.WriteTo failed: %v", err)
                 }
                 rb2 := make([]byte, 128)
                 if _, err := c2.Read(rb2); err != nil {
-                        t.Fatalf("net.Conn.Read failed: %v", err)
+                        t.Fatalf("Conn.Read failed: %v", err)
                 }
         }
 }