From 98d0da98da7ff26d59e478e6baa16bf4eb9d266c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 8 Dec 2017 07:07:45 -0800 Subject: [PATCH] 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 TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- src/net/dial_test.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/net/dial_test.go b/src/net/dial_test.go index 13fa9faacb..b3535dca39 100644 --- 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() -- 2.48.1