From 86693b30c53ea750d0f1e1a7210476ec9c9f8374 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 25 Dec 2014 00:21:00 +0000 Subject: [PATCH] * test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address): set timeout for recvfrom because if client thread is crashed, it waits infinity. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/resolv/test_dns.rb | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 18b5e97389..924691f041 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 25 09:18:55 2014 NAKAMURA Usaku + + * 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 * 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