diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/resolv/test_dns.rb | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Thu Dec 25 09:18:55 2014 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address): + set timeout for recvfrom because if client thread is crashed, it + waits infinity. + Thu Dec 25 08:42:11 2014 Eric Wong <e@80x24.org> * lib/uri/generic.rb (split_userinfo): fstring for 1-byte split diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index f3f6ec212f..da7fa43dbc 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -53,7 +53,9 @@ class TestResolvDNS < Test::Unit::TestCase } } server_thread = Thread.new { - msg, (_, client_port, _, client_address) = u.recvfrom(4096) + timeout(5) do + msg, (_, client_port, _, client_address) = u.recvfrom(4096) + end id, word2, qdcount, ancount, nscount, arcount = msg.unpack("nnnnnn") qr = (word2 & 0x8000) >> 15 opcode = (word2 & 0x7800) >> 11 |