more test cleanup

mattetti · Apr 16, 2011 · 7dd32fd · 7dd32fd
1 parent 83c53ae
commit 7dd32fd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/test/rubygems/test_gem_dependency_list.rb b/test/rubygems/test_gem_dependency_list.rb
@@ -24,7 +24,8 @@ def setup
   def test_self_from_source_index
     si = Gem::SourceIndex.new
     si.add_specs @a1, @b2
-    deps = Gem::DependencyList.from_source_index si
+    Gem.source_index = si
+    deps = Gem::DependencyList.from_source_index
 
     assert_equal %w[b-2 a-1], deps.dependency_order.map { |s| s.full_name }
   end

diff --git a/test/rubygems/test_gem_gem_path_searcher.rb b/test/rubygems/test_gem_gem_path_searcher.rb
@@ -30,7 +30,7 @@ def setup
 
     Gem.source_index = util_setup_spec_fetcher @foo1, @foo2, @bar1, @bar2
 
-    @gps = Gem::GemPathSearcher.new
+    @gps = Deprecate.skip_during { Gem::GemPathSearcher.new }
   end
 
   def test_find

diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
@@ -655,8 +655,10 @@ def test_install_check_dependencies_install_dir
 
     FileUtils.mv @gemhome, gemhome2
 
-    Gem.source_index =
-      Gem::SourceIndex.new [File.join(gemhome2, 'specifications')]
+    Deprecate.skip_during do
+      Gem.source_index =
+        Gem::SourceIndex.new [File.join(gemhome2, 'specifications')]
+    end
 
     util_setup_gem