Import RubyGems 1.0.0, r1575

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 19 insertions, 2 deletions

diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 83865e8033..fd3843851a 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -140,11 +140,12 @@ gems:
       raise SocketError
     end
 
+    uri = 'http://gems.example.com/yaml'
     e = assert_raise Gem::RemoteFetcher::FetchError do
-      fetcher.fetch_size 'http://gems.example.com/yaml'
+      fetcher.fetch_size uri
     end
 
-    assert_equal 'SocketError (SocketError)', e.message
+    assert_equal "SocketError (SocketError)\n\tgetting size of #{uri}", e.message
   end
 
   def test_no_proxy
@@ -231,6 +232,22 @@ gems:
     assert_equal 'EOFError: EOFError reading uri', e.message
   end
 
+  def test_fetch_path_open_uri_http_error
+    fetcher = Gem::RemoteFetcher.new nil
+
+    def fetcher.open_uri_or_path(uri)
+      io = StringIO.new 'went boom'
+      err = OpenURI::HTTPError.new 'error', io
+      raise err
+    end
+
+    e = assert_raise Gem::RemoteFetcher::FetchError do
+      fetcher.fetch_path 'uri'
+    end
+
+    assert_equal "OpenURI::HTTPError: error reading uri\n\twent boom", e.message
+  end
+
   def test_fetch_path_socket_error
     fetcher = Gem::RemoteFetcher.new nil