diff options
| author | Mikio Hara <mikioh.mikioh@gmail.com> | 2016-05-28 03:06:33 +0900 |
|---|---|---|
| committer | Mikio Hara <mikioh.mikioh@gmail.com> | 2016-05-30 03:30:14 +0000 |
| commit | dc5b5239e8020ca0b366ba02f99fe87728fa290c (patch) | |
| tree | 4a89cf4eaa0d05491c754ece9be6e38311c7c851 /src/net/dial_test.go | |
| parent | 4e01c132d03ee1f862ae8ba9db465d6047f950f2 (diff) | |
| download | go-dc5b5239e8020ca0b366ba02f99fe87728fa290c.tar.gz go-dc5b5239e8020ca0b366ba02f99fe87728fa290c.zip | |
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 <iant@golang.org>
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/net/dial_test.go')
| -rw-r--r-- | src/net/dial_test.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/net/dial_test.go b/src/net/dial_test.go index 5365677011..9fe507e901 100644 --- a/src/net/dial_test.go +++ b/src/net/dial_test.go @@ -87,17 +87,14 @@ func TestDialTimeoutFDLeak(t *testing.T) { // 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() - }() + defer func() { sw.Set(socktest.FilterClose, nil) }() var mu sync.Mutex var attempts int sw.Set(socktest.FilterClose, func(so *socktest.Status) (socktest.AfterFilter, error) { mu.Lock() attempts++ mu.Unlock() - return nil, errTimedout + return nil, nil }) const N = 100 |