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: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/net/dial_test.go b/src/net/dial_test.go
index 13fa9faacb56e4f56205de12d0c5ea570c872e01..b3535dca395b4cbcb36ba06d15142f16706fcd2c 100644 (file)
--- a/src/net/dial_test.go
+++ b/src/net/dial_test.go
@@ -85,11 +85,6 @@ func TestDialerDualStackFDLeak(t *testing.T) {
                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()
        origTestHookLookupIP := testHookLookupIP
        defer func() { testHookLookupIP = origTestHookLookupIP }()
@@ -115,7 +110,7 @@ func TestDialerDualStackFDLeak(t *testing.T) {
        const N = 10
        var wg sync.WaitGroup
        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++ {
                go func() {
                        defer wg.Done()