From b4089826fba2d261f7857307be50aeeb0b8adfce Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 13 Jan 2015 05:16:37 +0000 Subject: [PATCH] test_http.rb: test without DNS access * test/net/http/test_http.rb: get rid of accessing DNS actually for some servers returning wrong results. [ruby-core:67454] [Bug #10721] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/net/http/test_http.rb | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd97990699..340ab62f60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 13 14:16:35 2015 Nobuyoshi Nakada + + * test/net/http/test_http.rb: get rid of accessing DNS actually + for some servers returning wrong results. + [ruby-core:67454] [Bug #10721] + Mon Jan 12 23:21:57 2015 NAKAMURA Usaku * gems/bundled_gems: update test-unit to 3.0.9. diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb index 4d82fd7d1e..b72aadd54c 100644 --- a/test/net/http/test_http.rb +++ b/test/net/http/test_http.rb @@ -189,11 +189,14 @@ class TestNetHTTP < Test::Unit::TestCase end def test_failure_message_includes_failed_domain_and_port - begin - Net::HTTP.get(URI.parse("http://doesnotexist.bogus")) - fail "should have raised" - rescue => e - assert_includes e.message, "doesnotexist.bogus:80" + # hostname to be included in the error message + host = Struct.new(:to_s).new("") + port = 2119 + # hack to let TCPSocket.open fail + def host.to_str; raise SocketError, "open failure"; end + uri = Struct.new(:scheme, :hostname, :port).new("http", host, port) + assert_raise_with_message(SocketError, /#{host}:#{port}/) do + Net::HTTP.get(uri) end end