From 4721d2d970265589ec328aa07fe4816b05764999 Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Fri, 29 Jun 2018 02:19:52 +0900 Subject: [PATCH] ipv4: don't fail test on JS Change-Id: Ie3df352e1b59b7035bdf50a5b06feb3d1859de2a Reviewed-on: https://go-review.googlesource.com/121556 Run-TryBot: Mikio Hara TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- ipv4/doc.go | 2 +- ipv4/multicast_test.go | 4 ++-- ipv4/multicastlistener_test.go | 10 +++++----- ipv4/multicastsockopt_test.go | 4 ++-- ipv4/readwrite_go1_8_test.go | 4 ++-- ipv4/readwrite_go1_9_test.go | 4 ++-- ipv4/readwrite_test.go | 2 +- ipv4/unicast_test.go | 6 +++--- ipv4/unicastsockopt_test.go | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ipv4/doc.go b/ipv4/doc.go index b43935a5..d1245554 100644 --- a/ipv4/doc.go +++ b/ipv4/doc.go @@ -241,4 +241,4 @@ // IncludeSourceSpecificGroup may return an error. package ipv4 // import "golang.org/x/net/ipv4" -// BUG(mikio): This package is not implemented on NaCl and Plan 9. +// BUG(mikio): This package is not implemented on JS, NaCl and Plan 9. diff --git a/ipv4/multicast_test.go b/ipv4/multicast_test.go index bcf49736..2136a3c6 100644 --- a/ipv4/multicast_test.go +++ b/ipv4/multicast_test.go @@ -29,7 +29,7 @@ var packetConnReadWriteMulticastUDPTests = []struct { func TestPacketConnReadWriteMulticastUDP(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "solaris", "windows": + case "js", "nacl", "plan9", "solaris", "windows": t.Skipf("not supported on %s", runtime.GOOS) } ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback) @@ -117,7 +117,7 @@ var packetConnReadWriteMulticastICMPTests = []struct { func TestPacketConnReadWriteMulticastICMP(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "solaris", "windows": + case "js", "nacl", "plan9", "solaris", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if m, ok := nettest.SupportsRawIPSocket(); !ok { diff --git a/ipv4/multicastlistener_test.go b/ipv4/multicastlistener_test.go index e43fbbe0..ba2480e4 100644 --- a/ipv4/multicastlistener_test.go +++ b/ipv4/multicastlistener_test.go @@ -21,7 +21,7 @@ var udpMultipleGroupListenerTests = []net.Addr{ func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if testing.Short() { @@ -61,7 +61,7 @@ func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) { func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if testing.Short() { @@ -116,7 +116,7 @@ func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) { func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if testing.Short() { @@ -172,7 +172,7 @@ func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) { func TestIPSingleRawConnWithSingleGroupListener(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if testing.Short() { @@ -217,7 +217,7 @@ func TestIPSingleRawConnWithSingleGroupListener(t *testing.T) { func TestIPPerInterfaceSingleRawConnWithSingleGroupListener(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if testing.Short() { diff --git a/ipv4/multicastsockopt_test.go b/ipv4/multicastsockopt_test.go index f7efac24..c0a26800 100644 --- a/ipv4/multicastsockopt_test.go +++ b/ipv4/multicastsockopt_test.go @@ -26,7 +26,7 @@ var packetConnMulticastSocketOptionTests = []struct { func TestPacketConnMulticastSocketOptions(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9": + case "js", "nacl", "plan9": t.Skipf("not supported on %s", runtime.GOOS) } ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback) @@ -66,7 +66,7 @@ var rawConnMulticastSocketOptionTests = []struct { func TestRawConnMulticastSocketOptions(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9": + case "js", "nacl", "plan9": t.Skipf("not supported on %s", runtime.GOOS) } if m, ok := nettest.SupportsRawIPSocket(); !ok { diff --git a/ipv4/readwrite_go1_8_test.go b/ipv4/readwrite_go1_8_test.go index 1cd926e7..83bf927e 100644 --- a/ipv4/readwrite_go1_8_test.go +++ b/ipv4/readwrite_go1_8_test.go @@ -22,7 +22,7 @@ import ( func BenchmarkPacketConnReadWriteUnicast(b *testing.B) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": b.Skipf("not supported on %s", runtime.GOOS) } @@ -126,7 +126,7 @@ func BenchmarkPacketConnReadWriteUnicast(b *testing.B) { func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } diff --git a/ipv4/readwrite_go1_9_test.go b/ipv4/readwrite_go1_9_test.go index 365de022..ef76c8a7 100644 --- a/ipv4/readwrite_go1_9_test.go +++ b/ipv4/readwrite_go1_9_test.go @@ -22,7 +22,7 @@ import ( func BenchmarkPacketConnReadWriteUnicast(b *testing.B) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": b.Skipf("not supported on %s", runtime.GOOS) } @@ -172,7 +172,7 @@ func BenchmarkPacketConnReadWriteUnicast(b *testing.B) { func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } diff --git a/ipv4/readwrite_test.go b/ipv4/readwrite_test.go index 3896a8ae..1b7f7488 100644 --- a/ipv4/readwrite_test.go +++ b/ipv4/readwrite_test.go @@ -61,7 +61,7 @@ func BenchmarkReadWriteUnicast(b *testing.B) { func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } diff --git a/ipv4/unicast_test.go b/ipv4/unicast_test.go index 02c089f0..274a558c 100644 --- a/ipv4/unicast_test.go +++ b/ipv4/unicast_test.go @@ -20,7 +20,7 @@ import ( func TestPacketConnReadWriteUnicastUDP(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback) @@ -71,7 +71,7 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) { func TestPacketConnReadWriteUnicastICMP(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if m, ok := nettest.SupportsRawIPSocket(); !ok { @@ -157,7 +157,7 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) { func TestRawConnReadWriteUnicastICMP(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if m, ok := nettest.SupportsRawIPSocket(); !ok { diff --git a/ipv4/unicastsockopt_test.go b/ipv4/unicastsockopt_test.go index db5213b9..2bfda7ff 100644 --- a/ipv4/unicastsockopt_test.go +++ b/ipv4/unicastsockopt_test.go @@ -16,7 +16,7 @@ import ( func TestConnUnicastSocketOptions(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback) @@ -62,7 +62,7 @@ var packetConnUnicastSocketOptionTests = []struct { func TestPacketConnUnicastSocketOptions(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback) @@ -88,7 +88,7 @@ func TestPacketConnUnicastSocketOptions(t *testing.T) { func TestRawConnUnicastSocketOptions(t *testing.T) { switch runtime.GOOS { - case "nacl", "plan9", "windows": + case "js", "nacl", "plan9", "windows": t.Skipf("not supported on %s", runtime.GOOS) } if m, ok := nettest.SupportsRawIPSocket(); !ok {