Update RubyGems to 1.1.1 r1778 (almost 1.2)

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

1 files changed, 11 insertions, 9 deletions

diff --git a/test/rubygems/test_gem_source_info_cache_entry.rb b/test/rubygems/test_gem_source_info_cache_entry.rb
index c1194e34bc..6986c9cd7f 100644
--- a/test/rubygems/test_gem_source_info_cache_entry.rb
+++ b/test/rubygems/test_gem_source_info_cache_entry.rb
@@ -15,9 +15,9 @@ class TestGemSourceInfoCacheEntry < RubyGemTestCase
   end
 
   def test_refresh
-    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}.Z"] =
+    @fetcher.data["#{@gem_repo}Marshal.#{@marshal_version}.Z"] =
       proc { raise }
-    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] = @si.dump
+    @fetcher.data["#{@gem_repo}Marshal.#{@marshal_version}"] = @si.dump
 
     use_ui @ui do
       @sic_e.refresh @gem_repo, true
@@ -30,18 +30,20 @@ class TestGemSourceInfoCacheEntry < RubyGemTestCase
     a1_name = @a1.full_name
     a2_name = @a2.full_name
 
-    @fetcher.data["#{@gem_repo}/quick/index.rz"] =
+    @fetcher.data["#{@gem_repo}quick/index.rz"] =
         util_zip [a1_name, a2_name].join("\n")
-    @fetcher.data["#{@gem_repo}/quick/latest_index.rz"] = util_zip a2_name
-    @fetcher.data["#{@gem_repo}/quick/Marshal.#{Gem.marshal_version}/#{a1_name}.gemspec.rz"] = util_zip Marshal.dump(@a1)
-    @fetcher.data["#{@gem_repo}/quick/Marshal.#{Gem.marshal_version}/#{a2_name}.gemspec.rz"] = util_zip Marshal.dump(@a2)
-    @fetcher.data["#{@gem_repo}/Marshal.#{Gem.marshal_version}"] =
+    @fetcher.data["#{@gem_repo}quick/latest_index.rz"] = util_zip a2_name
+    @fetcher.data["#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a1_name}.gemspec.rz"] = util_zip Marshal.dump(@a1)
+    @fetcher.data["#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{a2_name}.gemspec.rz"] = util_zip Marshal.dump(@a2)
+    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] =
       Marshal.dump @si
 
     sic_e = Gem::SourceInfoCacheEntry.new Gem::SourceIndex.new, 0
 
+    assert_equal [], sic_e.source_index.map { |n,| n }
+
     use_ui @ui do
-      sic_e.refresh @gem_repo, false
+      assert sic_e.refresh(@gem_repo, false)
     end
 
     assert_equal [a2_name], sic_e.source_index.map { |n,| n }.sort
@@ -63,7 +65,7 @@ class TestGemSourceInfoCacheEntry < RubyGemTestCase
     si = Gem::SourceIndex.new
     si.add_spec @a1
     si.add_spec @b2
-    @fetcher.data["#{@gem_repo}/Marshal.#{@marshal_version}"] = si.dump
+    @fetcher.data["#{@gem_repo}Marshal.#{@marshal_version}"] = si.dump
 
     use_ui @ui do
       @sic_e.refresh @gem_repo, true