Skip to content

Commit

Permalink
ipv4, ipv6, nettest: skip unsupported tests on wasip1
Browse files Browse the repository at this point in the history
Updates golang/go#58141

Change-Id: Iec7a525633dcc93c8941c9aaaef6e54e6867a8d0
Reviewed-on: https://go-review.googlesource.com/c/net/+/485675
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
  • Loading branch information
tklauser authored and gopherbot committed Apr 19, 2023
1 parent eb1572c commit 938ff15
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 45 deletions.
6 changes: 3 additions & 3 deletions ipv4/multicast_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var packetConnReadWriteMulticastUDPTests = []struct {

func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "illumos", "js", "nacl", "plan9", "solaris", "windows", "zos":
case "fuchsia", "hurd", "illumos", "js", "nacl", "plan9", "solaris", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
ifi, err := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
Expand Down Expand Up @@ -132,7 +132,7 @@ var packetConnReadWriteMulticastICMPTests = []struct {

func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "illumos", "js", "nacl", "plan9", "solaris", "windows":
case "fuchsia", "hurd", "illumos", "js", "nacl", "plan9", "solaris", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsRawSocket() {
Expand Down Expand Up @@ -262,7 +262,7 @@ var rawConnReadWriteMulticastICMPTests = []struct {

func TestRawConnReadWriteMulticastICMP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "illumos", "js", "nacl", "plan9", "solaris", "windows":
case "fuchsia", "hurd", "illumos", "js", "nacl", "plan9", "solaris", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if testing.Short() {
Expand Down
10 changes: 5 additions & 5 deletions ipv4/multicastlistener_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var udpMultipleGroupListenerTests = []net.Addr{

func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if testing.Short() {
Expand Down Expand Up @@ -61,7 +61,7 @@ func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {

func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if testing.Short() {
Expand Down Expand Up @@ -116,7 +116,7 @@ func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {

func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if testing.Short() {
Expand Down Expand Up @@ -172,7 +172,7 @@ func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {

func TestIPSingleRawConnWithSingleGroupListener(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if testing.Short() {
Expand Down Expand Up @@ -217,7 +217,7 @@ func TestIPSingleRawConnWithSingleGroupListener(t *testing.T) {

func TestIPPerInterfaceSingleRawConnWithSingleGroupListener(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if testing.Short() {
Expand Down
4 changes: 2 additions & 2 deletions ipv4/multicastsockopt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var packetConnMulticastSocketOptionTests = []struct {

func TestPacketConnMulticastSocketOptions(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
ifi, err := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
Expand Down Expand Up @@ -66,7 +66,7 @@ var rawConnMulticastSocketOptionTests = []struct {

func TestRawConnMulticastSocketOptions(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsRawSocket() {
Expand Down
8 changes: 4 additions & 4 deletions ipv4/readwrite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

func BenchmarkReadWriteUnicast(b *testing.B) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
b.Skipf("not supported on %s", runtime.GOOS)
}

Expand Down Expand Up @@ -69,7 +69,7 @@ func BenchmarkReadWriteUnicast(b *testing.B) {

func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
b.Skipf("not supported on %s", runtime.GOOS)
}

Expand Down Expand Up @@ -220,7 +220,7 @@ func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {

func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}

Expand Down Expand Up @@ -324,7 +324,7 @@ func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {

func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}

Expand Down
6 changes: 3 additions & 3 deletions ipv4/unicast_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
// Skip this check on z/OS since net.Interfaces() does not return loopback, however
Expand Down Expand Up @@ -85,7 +85,7 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {

func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsRawSocket() {
Expand Down Expand Up @@ -180,7 +180,7 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) {

func TestRawConnReadWriteUnicastICMP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsRawSocket() {
Expand Down
6 changes: 3 additions & 3 deletions ipv4/unicastsockopt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

func TestConnUnicastSocketOptions(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if _, err := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback); err != nil {
Expand Down Expand Up @@ -61,7 +61,7 @@ var packetConnUnicastSocketOptionTests = []struct {

func TestPacketConnUnicastSocketOptions(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if _, err := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback); err != nil {
Expand All @@ -86,7 +86,7 @@ func TestPacketConnUnicastSocketOptions(t *testing.T) {

func TestRawConnUnicastSocketOptions(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsRawSocket() {
Expand Down
4 changes: 2 additions & 2 deletions ipv6/icmp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestICMPString(t *testing.T) {

func TestICMPFilter(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}

Expand All @@ -61,7 +61,7 @@ func TestICMPFilter(t *testing.T) {

func TestSetICMPFilter(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down
4 changes: 2 additions & 2 deletions ipv6/multicast_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var packetConnReadWriteMulticastUDPTests = []struct {

func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down Expand Up @@ -144,7 +144,7 @@ func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
`and needs investigation, see golang.org/issue/42064`)
}
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down
10 changes: 5 additions & 5 deletions ipv6/multicastlistener_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var udpMultipleGroupListenerTests = []net.Addr{

func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down Expand Up @@ -61,7 +61,7 @@ func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {

func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down Expand Up @@ -116,7 +116,7 @@ func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {

func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down Expand Up @@ -172,7 +172,7 @@ func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {

func TestIPSinglePacketConnWithSingleGroupListener(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down Expand Up @@ -216,7 +216,7 @@ func TestIPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
switch runtime.GOOS {
case "darwin", "ios", "dragonfly", "openbsd": // platforms that return fe80::1%lo0: bind: can't assign requested address
t.Skipf("not supported on %s", runtime.GOOS)
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down
2 changes: 1 addition & 1 deletion ipv6/multicastsockopt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var packetConnMulticastSocketOptionTests = []struct {

func TestPacketConnMulticastSocketOptions(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down
8 changes: 4 additions & 4 deletions ipv6/readwrite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

func BenchmarkReadWriteUnicast(b *testing.B) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
b.Skipf("not supported on %s", runtime.GOOS)
}

Expand Down Expand Up @@ -72,7 +72,7 @@ func BenchmarkReadWriteUnicast(b *testing.B) {

func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
b.Skipf("not supported on %s", runtime.GOOS)
}

Expand Down Expand Up @@ -220,7 +220,7 @@ func BenchmarkPacketConnReadWriteUnicast(b *testing.B) {

func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
ifi, err := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
Expand Down Expand Up @@ -327,7 +327,7 @@ func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {

func TestPacketConnConcurrentReadWriteUnicast(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}

Expand Down
6 changes: 3 additions & 3 deletions ipv6/sockopt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

func TestConnInitiatorPathMTU(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "wasip1", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}

Expand Down Expand Up @@ -51,7 +51,7 @@ func TestConnInitiatorPathMTU(t *testing.T) {

func TestConnResponderPathMTU(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "wasip1", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if _, err := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback); err != nil {
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestConnResponderPathMTU(t *testing.T) {

func TestPacketConnChecksum(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down
4 changes: 2 additions & 2 deletions ipv6/unicast_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if _, err := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback); err != nil {
Expand Down Expand Up @@ -91,7 +91,7 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {

func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows", "zos":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows", "zos":
t.Skipf("not supported on %s", runtime.GOOS)
}
if !nettest.SupportsIPv6() {
Expand Down
4 changes: 2 additions & 2 deletions ipv6/unicastsockopt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

func TestConnUnicastSocketOptions(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if _, err := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback); err != nil {
Expand Down Expand Up @@ -61,7 +61,7 @@ var packetConnUnicastSocketOptionTests = []struct {

func TestPacketConnUnicastSocketOptions(t *testing.T) {
switch runtime.GOOS {
case "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
case "fuchsia", "hurd", "js", "nacl", "plan9", "wasip1", "windows":
t.Skipf("not supported on %s", runtime.GOOS)
}
if _, err := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback); err != nil {
Expand Down
Loading

0 comments on commit 938ff15

Please sign in to comment.