[DRE-commits] [SCM] ruby-minitest.git branch, master, updated. upstream/2.9.1-23-g0e3d471

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit f79ff7565c840a2e5864d851c033b3e2d3913652
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Mon Feb 27 15:07:36 2012 +0100

    Refresh patch 'disable-some-tests'

diff --git a/debian/patches/disable-some-tests b/debian/patches/disable-some-tests
index d9e2380..268df41 100644
--- a/debian/patches/disable-some-tests
+++ b/debian/patches/disable-some-tests
@@ -3,7 +3,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
 ---
 --- a/test/test_minitest_unit.rb
 +++ b/test/test_minitest_unit.rb
-@@ -181,7 +181,7 @@ Finished tests in 0.00
+@@ -181,7 +181,7 @@
      assert_report expected
    end
  
@@ -12,7 +12,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      tc = Class.new(MiniTest::Unit::TestCase) do
        def test_something
          assert true
-@@ -216,7 +216,7 @@ Finished tests in 0.00
+@@ -216,7 +216,7 @@
      assert_report expected
    end
  
@@ -21,7 +21,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      tc = Class.new(MiniTest::Unit::TestCase) do
        def test_something
          assert true
-@@ -977,7 +977,7 @@ class TestMiniTestUnitTestCase < MiniTes
+@@ -1059,7 +1059,7 @@
      end
    end
  
@@ -30,7 +30,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      e = assert_raises MiniTest::Assertion do
        @tc.assert_raises RuntimeError do
          raise SyntaxError, "icky"
-@@ -997,7 +997,7 @@ FILE:LINE:in `test_assert_raises_trigger
+@@ -1079,7 +1079,7 @@
      assert_equal expected, actual
    end
  
@@ -39,7 +39,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      e = assert_raises MiniTest::Assertion do
        @tc.assert_raises RuntimeError, "XXX" do
          raise SyntaxError, "icky"
-@@ -1044,7 +1044,7 @@ FILE:LINE:in `test_assert_raises_trigger
+@@ -1126,7 +1126,7 @@
      assert_equal expected, e.message
    end
  

-- 
ruby-minitest.git