瀏覽代碼

go.net/ipv6: better readability in test

R=golang-codereviews, dave
CC=golang-codereviews
https://golang.org/cl/46740043
Mikio Hara 12 年之前
父節點
當前提交
16ae462212
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 2 2
      ipv6/multicast_test.go
  2. 4 4
      ipv6/unicast_test.go

+ 2 - 2
ipv6/multicast_test.go

@@ -75,7 +75,7 @@ func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
 		if err := p.SetControlMessage(cf, toggle); err != nil {
 			t.Fatalf("ipv6.PacketConn.SetControlMessage failed: %v", err)
 		}
-		if err := p.SetDeadline(time.Now().Add(time.Millisecond * 200)); err != nil {
+		if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
 			t.Fatalf("ipv6.PacketConn.SetDeadline failed: %v", err)
 		}
 		cm.HopLimit = i + 1
@@ -181,7 +181,7 @@ func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
 		if err := p.SetControlMessage(cf, toggle); err != nil {
 			t.Fatalf("ipv6.PacketConn.SetControlMessage failed: %v", err)
 		}
-		if err := p.SetDeadline(time.Now().Add(time.Millisecond * 200)); err != nil {
+		if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
 			t.Fatalf("ipv6.PacketConn.SetDeadline failed: %v", err)
 		}
 		cm.HopLimit = i + 1

+ 4 - 4
ipv6/unicast_test.go

@@ -53,7 +53,7 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
 			t.Fatalf("ipv6.PacketConn.SetControlMessage failed: %v", err)
 		}
 		cm.HopLimit = i + 1
-		if err := p.SetWriteDeadline(time.Now().Add(time.Millisecond * 100)); err != nil {
+		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
 			t.Fatalf("ipv6.PacketConn.SetWriteDeadline failed: %v", err)
 		}
 		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
@@ -62,7 +62,7 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
 			t.Fatalf("ipv6.PacketConn.WriteTo failed: short write: %v", n)
 		}
 		rb := make([]byte, 128)
-		if err := p.SetReadDeadline(time.Now().Add(time.Millisecond * 100)); err != nil {
+		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
 			t.Fatalf("ipv6.PacketConn.SetReadDeadline failed: %v", err)
 		}
 		if n, cm, _, err := p.ReadFrom(rb); err != nil {
@@ -146,7 +146,7 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
 			t.Fatalf("ipv6.PacketConn.SetControlMessage failed: %v", err)
 		}
 		cm.HopLimit = i + 1
-		if err := p.SetWriteDeadline(time.Now().Add(time.Millisecond * 100)); err != nil {
+		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
 			t.Fatalf("ipv6.PacketConn.SetWriteDeadline failed: %v", err)
 		}
 		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
@@ -155,7 +155,7 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
 			t.Fatalf("ipv6.PacketConn.WriteTo failed: short write: %v", n)
 		}
 		rb := make([]byte, 128)
-		if err := p.SetReadDeadline(time.Now().Add(time.Millisecond * 100)); err != nil {
+		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
 			t.Fatalf("ipv6.PacketConn.SetReadDeadline failed: %v", err)
 		}
 		if n, cm, _, err := p.ReadFrom(rb); err != nil {