diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 06:03:13 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-28 06:03:13 +0000 |
| commit | 84ec88a2319cfe716212d62f70bc10e855c2d2aa (patch) | |
| tree | 226f8588be6ff56a0bd9f44ba8fc9a0aae71e875 /test | |
| parent | b63b168ce99dc0763860bcf7d8e27b57b2582e4d (diff) | |
merge revision(s) 62671: [Backport #14571]
resolv.rb: close socket
* lib/resolv.rb (UnconnectedUDP#lazy_initialize): store new
sockets before binding, so the sockets get closed when the
requester is closing.
* lib/resolv.rb (ConnectedUDP#lazy_initialize): ditto.
* lib/resolv.rb (UnconnectedUDP#close): synchronize to get rid of
race condition.
* lib/resolv.rb (ConnectedUDP#close): ditto.
[ruby-core:85901] [Bug #14571]
From: quixoten (Devin Christensen) <quixoten@gmail.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/resolv/test_dns.rb | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index d1431c1427..efd657aef1 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -3,6 +3,7 @@ require 'test/unit' require 'resolv' require 'socket' require 'tempfile' +require 'minitest/mock' class TestResolvDNS < Test::Unit::TestCase def setup @@ -221,4 +222,22 @@ class TestResolvDNS < Test::Unit::TestCase } assert_operator(2**14, :<, m.to_s.length) end + + def assert_no_fd_leak + socket = assert_throw(self) do |tag| + Resolv::DNS.stub(:bind_random_port, ->(s, *) {throw(tag, s)}) do + yield.getname("8.8.8.8") + end + end + + assert_predicate(socket, :closed?, "file descriptor leaked") + end + + def test_no_fd_leak_connected + assert_no_fd_leak {Resolv::DNS.new(nameserver_port: [['127.0.0.1', 53]])} + end + + def test_no_fd_leak_unconnected + assert_no_fd_leak {Resolv::DNS.new} + end end |