nobu	2015-01-13 14:16:37 +0900 (Tue, 13 Jan 2015)

  New Revision: 49231

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49231

  Log:
    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]

  Modified files:
    trunk/ChangeLog
    trunk/test/net/http/test_http.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49230)
+++ ChangeLog	(revision 49231)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Jan 13 14:16:35 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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  <usa@r...>
 
 	* gems/bundled_gems: update test-unit to 3.0.9.
Index: test/net/http/test_http.rb
===================================================================
--- test/net/http/test_http.rb	(revision 49230)
+++ test/net/http/test_http.rb	(revision 49231)
@@ -189,11 +189,14 @@ class TestNetHTTP < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/net/http/test_http.rb#L189
   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("<example>")
+    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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/