github/golang.net
2
0
Fork 0
mirror of https://github.com/golang/net.git synced 2026-03-31 02:17:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

ipv4,ipv6: remove unneeded deadlines added for flaky tests

Browse Source 
Deadlines were added in https://go.dev/cl/21360043, but these are
unneeded as the tests will fail anyways as a result of the timeout.
This prevents these timeouts from causing further test flakes.

Fixes #58955

Change-Id: I76ebf7452bf326a09f1a7665d362fe68f345a4be
GitHub-Last-Rev: 9ca732a5ea
GitHub-Pull-Request: golang/net#172
Reviewed-on: https://go-review.googlesource.com/c/net/+/492620
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: WANG Xuerui <git@xen0n.name>
Run-TryBot: Ian Lance Taylor <iant@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Ian Lance Taylor <iant@google.com>
This commit is contained in:
Nick Figgins
2023-05-05 12:26:43 +00:00
committed by Gopher Robot
parent 23ce3b89bc
commit 3b31286d86
3 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ipv4/multicast_test.go
View File

@@ -11,7 +11,6 @@ import (
"os"
"runtime"
"testing"
"time"
"golang.org/x/net/icmp"
"golang.org/x/net/internal/iana"
@@ -100,9 +99,6 @@ func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
}
t.Fatal(err)
}
if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
t.Fatal(err)
}
if err := p.SetMulticastTTL(i + 1); err != nil {
t.Fatal(err)
}
@@ -217,9 +213,6 @@ func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
}
t.Fatal(err)
}
if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
t.Fatal(err)
}
if err := p.SetMulticastTTL(i + 1); err != nil {
t.Fatal(err)
}
@@ -337,9 +330,6 @@ func TestRawConnReadWriteMulticastICMP(t *testing.T) {
}
t.Fatal(err)
}
if err := r.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
t.Fatal(err)
}
r.SetMulticastTTL(i + 1)
if err := r.WriteTo(wh, wb, nil); err != nil {
t.Fatal(err)

18
ipv4/unicast_test.go
View File

@@ -50,9 +50,6 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
t.Fatal(err)
}
p.SetTTL(i + 1)
if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
backoff := time.Millisecond
for {
@@ -72,9 +69,6 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
}
rb := make([]byte, 128)
if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
if n, _, _, err := p.ReadFrom(rb); err != nil {
t.Fatal(err)
} else if !bytes.Equal(rb[:n], wb) {
@@ -130,9 +124,6 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
t.Fatal(err)
}
p.SetTTL(i + 1)
if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
backoff := time.Millisecond
for {
@@ -153,9 +144,6 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
rb := make([]byte, 128)
loop:
if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
if n, _, _, err := p.ReadFrom(rb); err != nil {
t.Fatal(err)
} else {
@@ -226,17 +214,11 @@ func TestRawConnReadWriteUnicastICMP(t *testing.T) {
}
t.Fatal(err)
}
if err := r.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
if err := r.WriteTo(wh, wb, nil); err != nil {
t.Fatal(err)
}
rb := make([]byte, ipv4.HeaderLen+128)
loop:
if err := r.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
if _, b, _, err := r.ReadFrom(rb); err != nil {
t.Fatal(err)
} else {

12
ipv6/unicast_test.go
View File

@@ -57,9 +57,6 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
t.Fatal(err)
}
cm.HopLimit = i + 1
if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
backoff := time.Millisecond
for {
@@ -79,9 +76,6 @@ func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
}
rb := make([]byte, 128)
if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
if n, _, _, err := p.ReadFrom(rb); err != nil {
t.Fatal(err)
} else if !bytes.Equal(rb[:n], wb) {
@@ -168,9 +162,6 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
t.Fatal(err)
}
cm.HopLimit = i + 1
if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
backoff := time.Millisecond
for {
@@ -190,9 +181,6 @@ func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
}
rb := make([]byte, 128)
if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
t.Fatal(err)
}
if n, _, _, err := p.ReadFrom(rb); err != nil {
t.Fatal(err)
} else {