[DRE-commits] [SCM] rubygems.git branch, master, updated. upstream/1.7.2-34-ge187262

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 65a83b5d95cf4722f86d7f3e9a4f46151755ea4a
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Fri Oct 7 14:05:12 2011 +0200

    disable-failing-tests.diff: refresh.

diff --git a/debian/patches/disable-failing-tests.diff b/debian/patches/disable-failing-tests.diff
index 4fdc3a3..2beb2f7 100644
--- a/debian/patches/disable-failing-tests.diff
+++ b/debian/patches/disable-failing-tests.diff
@@ -1,7 +1,7 @@
 Description: disable tests that are failing due to Debian-specific modifications to Rubygems.
 --- a/test/rubygems/test_gem.rb
 +++ b/test/rubygems/test_gem.rb
-@@ -461,7 +461,7 @@ class TestGem < Gem::TestCase
+@@ -498,7 +498,7 @@ class TestGem < Gem::TestCase
      assert_equal File.join(@gemhome, 'bin'), Gem.bindir(Pathname.new(Gem.dir))
    end
  
@@ -10,7 +10,7 @@ Description: disable tests that are failing due to Debian-specific modifications
      default = Gem.default_dir
      bindir = if defined?(RUBY_FRAMEWORK_VERSION) then
                 '/usr/bin'
-@@ -520,7 +520,7 @@ class TestGem < Gem::TestCase
+@@ -550,7 +550,7 @@ class TestGem < Gem::TestCase
      assert_nil Gem.datadir('xyzzy')
    end
  
@@ -21,34 +21,34 @@ Description: disable tests that are failing due to Debian-specific modifications
  
 --- a/test/rubygems/test_gem_commands_update_command.rb
 +++ b/test/rubygems/test_gem_commands_update_command.rb
-@@ -82,7 +82,7 @@ class TestGemCommandsUpdateCommand < Gem
+@@ -83,7 +83,7 @@ class TestGemCommandsUpdateCommand < Gem
      end
    end
  
 -  def test_execute_system
 +  def est_execute_system
+     util_clear_gems
      util_setup_rubygem9
      util_setup_spec_fetcher @rubygem9
-     util_add_to_fetcher @rubygem9
-@@ -106,7 +106,7 @@ class TestGemCommandsUpdateCommand < Gem
+@@ -107,7 +107,7 @@ class TestGemCommandsUpdateCommand < Gem
      assert_empty out
    end
  
 -  def test_execute_system_at_latest
 +  def est_execute_system_at_latest
+     util_clear_gems
      util_setup_rubygem_current
      util_setup_spec_fetcher @rubygem_current
-     util_add_to_fetcher @rubygem_current
-@@ -128,7 +128,7 @@ class TestGemCommandsUpdateCommand < Gem
+@@ -129,7 +129,7 @@ class TestGemCommandsUpdateCommand < Gem
      assert_empty out
    end
  
 -  def test_execute_system_multiple
 +  def est_execute_system_multiple
+     util_clear_gems
      util_setup_rubygem9
      util_setup_rubygem8
-     util_setup_spec_fetcher @rubygem8, @rubygem9
-@@ -153,7 +153,7 @@ class TestGemCommandsUpdateCommand < Gem
+@@ -154,7 +154,7 @@ class TestGemCommandsUpdateCommand < Gem
      assert_empty out
    end
  
@@ -57,7 +57,7 @@ Description: disable tests that are failing due to Debian-specific modifications
      util_clear_gems
      util_setup_rubygem9
      util_setup_rubygem8
-@@ -178,7 +178,7 @@ class TestGemCommandsUpdateCommand < Gem
+@@ -179,7 +179,7 @@ class TestGemCommandsUpdateCommand < Gem
      assert_empty out
    end
  
@@ -66,7 +66,7 @@ Description: disable tests that are failing due to Debian-specific modifications
      util_clear_gems
      util_setup_rubygem9
      util_setup_rubygem8
-@@ -203,7 +203,7 @@ class TestGemCommandsUpdateCommand < Gem
+@@ -204,7 +204,7 @@ class TestGemCommandsUpdateCommand < Gem
      assert_empty out
    end
  

-- 
rubygems.git