Commit 98d0da98 authored by Ian Lance Taylor's avatar Ian Lance Taylor

net: increase timeout for TestDialerDualStackFDLeak

This test has been getting occasional timeouts on the race builder.
The point of the test is whether a file descriptor leaks, not whether
the connection occurs in a certain amount of time. So use a very large
timeout. The connection is normally fast and the timeout doesn't matter.

Updates #13324

Change-Id: Ie1051c4a0be1fca4e63b1277101770be0cdae512
Reviewed-on: https://go-review.googlesource.com/82916
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: 's avatarBrad Fitzpatrick <bradfitz@golang.org>
parent 25363de2
...@@ -85,11 +85,6 @@ func TestDialerDualStackFDLeak(t *testing.T) { ...@@ -85,11 +85,6 @@ func TestDialerDualStackFDLeak(t *testing.T) {
t.Skip("both IPv4 and IPv6 are required") t.Skip("both IPv4 and IPv6 are required")
} }
closedPortDelay, expectClosedPortDelay := dialClosedPort()
if closedPortDelay > expectClosedPortDelay {
t.Errorf("got %v; want <= %v", closedPortDelay, expectClosedPortDelay)
}
before := sw.Sockets() before := sw.Sockets()
origTestHookLookupIP := testHookLookupIP origTestHookLookupIP := testHookLookupIP
defer func() { testHookLookupIP = origTestHookLookupIP }() defer func() { testHookLookupIP = origTestHookLookupIP }()
...@@ -115,7 +110,7 @@ func TestDialerDualStackFDLeak(t *testing.T) { ...@@ -115,7 +110,7 @@ func TestDialerDualStackFDLeak(t *testing.T) {
const N = 10 const N = 10
var wg sync.WaitGroup var wg sync.WaitGroup
wg.Add(N) wg.Add(N)
d := &Dialer{DualStack: true, Timeout: 100*time.Millisecond + closedPortDelay} d := &Dialer{DualStack: true, Timeout: 5 * time.Second}
for i := 0; i < N; i++ { for i := 0; i < N; i++ {
go func() { go func() {
defer wg.Done() defer wg.Done()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment