[DRE-commits] [SCM] ruby-minitest.git branch, master, updated. debian/4.7.3-1-9-g4b7c215

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit 2e0f66ab5c50c79b3e6b3dc68d916898df43d9c7
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu May 16 01:43:32 2013 +0200

    refresh patches

diff --git a/debian/patches/disable-require-rubygems b/debian/patches/disable-require-rubygems
index eb127a7..cfa1662 100644
--- a/debian/patches/disable-require-rubygems
+++ b/debian/patches/disable-require-rubygems
@@ -1,15 +1,16 @@
 Description: disable a require 'rubygems'.
 Author: Lucas Nussbaum <lucas at debian.org>
+Last-Update: 2013-05-16
 --- a/lib/minitest/autorun.rb
 +++ b/lib/minitest/autorun.rb
 @@ -1,10 +1,3 @@
 -begin
--  require 'rubygems'
--  gem 'minitest'
+-  require "rubygems"
+-  gem "minitest"
 -rescue Gem::LoadError
 -  # do nothing
 -end
 -
- require 'minitest/unit'
- require 'minitest/spec'
- require 'minitest/mock'
+ require "minitest"
+ require "minitest/spec"
+ require "minitest/mock"
diff --git a/debian/patches/disable-some-tests b/debian/patches/disable-some-tests
index 867071d..64335a6 100644
--- a/debian/patches/disable-some-tests
+++ b/debian/patches/disable-some-tests
@@ -1,51 +1,71 @@
 Description: Disable some broken tests
 Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
-Last-Update: 2013-04-05
+Last-Update: 2013-05-16
 ---
 --- a/test/minitest/test_minitest_unit.rb
 +++ b/test/minitest/test_minitest_unit.rb
-@@ -270,7 +270,7 @@
+@@ -182,7 +182,7 @@
      assert_report expected
    end
  
 -  def test_run_error
 +  def est_run_error
-     Class.new MiniTest::Unit::TestCase do
+     @tu =
+     Class.new Minitest::Test do
        def test_something
-         assert true
-@@ -297,7 +297,7 @@
+@@ -210,7 +210,7 @@
      assert_report expected
    end
  
 -  def test_run_error_teardown
 +  def est_run_error_teardown
-     Class.new MiniTest::Unit::TestCase do
+     @tu =
+     Class.new Minitest::Test do
        def test_something
-         assert true
-@@ -1170,7 +1170,7 @@
+@@ -1156,7 +1156,7 @@
      end
    end
  
 -  def test_assert_raises_triggered_different
 +  def est_assert_raises_triggered_different
-     e = assert_raises MiniTest::Assertion do
+     e = assert_raises Minitest::Assertion do
        @tc.assert_raises RuntimeError do
          raise SyntaxError, "icky"
-@@ -1192,7 +1192,7 @@
+@@ -1178,7 +1178,7 @@
      assert_equal expected, actual
    end
  
 -  def test_assert_raises_triggered_different_msg
 +  def est_assert_raises_triggered_different_msg
-     e = assert_raises MiniTest::Assertion do
+     e = assert_raises Minitest::Assertion do
        @tc.assert_raises RuntimeError, "XXX" do
          raise SyntaxError, "icky"
-@@ -1239,7 +1239,7 @@
+@@ -1225,7 +1225,7 @@
      assert_equal expected, e.message
    end
  
 -  def test_assert_raises_triggered_subclass
 +  def est_assert_raises_triggered_subclass
-     e = assert_raises MiniTest::Assertion do
+     e = assert_raises Minitest::Assertion do
        @tc.assert_raises StandardError do
          raise AnError
+@@ -1803,7 +1803,7 @@
+     end
+   end
+ 
+-  def test_to_s_error_in_test_and_teardown
++  def est_to_s_error_in_test_and_teardown
+     @tu = Class.new Minitest::Test do
+       def test_method
+         raise AnError
+--- a/test/minitest/test_minitest_reporter.rb
++++ b/test/minitest/test_minitest_reporter.rb
+@@ -197,7 +197,7 @@
+     assert_equal exp, normalize_output(io.string)
+   end
+ 
+-  def test_report_error
++  def est_report_error
+     r.start
+     r.record error_test
+     r.report

-- 
ruby-minitest.git