From dc5b5239e8020ca0b366ba02f99fe87728fa290c Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Sat, 28 May 2016 03:06:33 +0900 Subject: net: don't call forceCloseSockets in non-TestMain functions forceCloseSockets is just designed as a kingston valve for TestMain function and is not suitable to keep track of inflight sockets. Fixes #15525. Change-Id: Id967fe5b8da99bb08b699cc45e07bbc3dfc3ae3d Reviewed-on: https://go-review.googlesource.com/23505 Reviewed-by: Ian Lance Taylor Run-TryBot: Mikio Hara TryBot-Result: Gobot Gobot --- src/net/timeout_test.go | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/net/timeout_test.go') diff --git a/src/net/timeout_test.go b/src/net/timeout_test.go index 7991a579fd..14797eedb7 100644 --- a/src/net/timeout_test.go +++ b/src/net/timeout_test.go @@ -41,19 +41,6 @@ func TestDialTimeout(t *testing.T) { defer func() { testHookDialChannel = origTestHookDialChannel }() defer sw.Set(socktest.FilterConnect, nil) - // Avoid tracking open-close jitterbugs between netFD and - // socket that leads to confusion of information inside - // socktest.Switch. - // It may happen when the Dial call bumps against TCP - // simultaneous open. See selfConnect in tcpsock_posix.go. - defer func() { - sw.Set(socktest.FilterClose, nil) - forceCloseSockets() - }() - sw.Set(socktest.FilterClose, func(so *socktest.Status) (socktest.AfterFilter, error) { - return nil, errTimedout - }) - for i, tt := range dialTimeoutTests { switch runtime.GOOS { case "plan9", "windows": -- cgit v1.3