[DRE-commits] [SCM] ruby-minitest.git branch, master, updated. upstream/2.6.1-16-gdce7f11

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit dce7f11d3c08378580200c84dc3d6cd3a8d66cb1
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue Dec 20 20:29:27 2011 +0100

    refresh patch

diff --git a/debian/patches/disable-some-tests b/debian/patches/disable-some-tests
index 0584510..d9e2380 100644
--- a/debian/patches/disable-some-tests
+++ b/debian/patches/disable-some-tests
@@ -3,26 +3,8 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
 ---
 --- a/test/test_minitest_unit.rb
 +++ b/test/test_minitest_unit.rb
-@@ -142,7 +142,7 @@ Finished tests in 0.00
-     assert_match(/^Exception.*Oh no again!/m, @tu.report.first)
-   end
- 
--  def test_filter_backtrace
-+  def est_filter_backtrace
-     # this is a semi-lame mix of relative paths.
-     # I cheated by making the autotest parts not have ./
-     bt = (["lib/autotest.rb:571:in `add_exception'",
-@@ -171,7 +171,7 @@ Finished tests in 0.00
-     assert_equal ex, fu
-   end
- 
--  def test_filter_backtrace_unit_starts
-+  def est_filter_backtrace_unit_starts
-     bt = (["#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
-           BT_MIDDLE +
-           ["#{MINITEST_BASE_DIR}/mini/test.rb:29",
-@@ -184,7 +184,7 @@ Finished tests in 0.00
-     assert_equal ex, fu
+@@ -181,7 +181,7 @@ Finished tests in 0.00
+     assert_report expected
    end
  
 -  def test_run_error
@@ -30,7 +12,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      tc = Class.new(MiniTest::Unit::TestCase) do
        def test_something
          assert true
-@@ -217,7 +217,7 @@ RuntimeError: unhandled exception
+@@ -216,7 +216,7 @@ Finished tests in 0.00
      assert_report expected
    end
  
@@ -39,16 +21,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      tc = Class.new(MiniTest::Unit::TestCase) do
        def test_something
          assert true
-@@ -250,7 +250,7 @@ RuntimeError: unhandled exception
-     assert_report expected
-   end
- 
--  def test_run_failing
-+  def est_run_failing
-     tc = Class.new(MiniTest::Unit::TestCase) do
-       def test_something
-         assert true
-@@ -976,7 +976,7 @@ class TestMiniTestUnitTestCase < MiniTes
+@@ -977,7 +977,7 @@ class TestMiniTestUnitTestCase < MiniTes
      end
    end
  
@@ -57,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"
-@@ -996,7 +996,7 @@ FILE:LINE:in `test_assert_raises_trigger
+@@ -997,7 +997,7 @@ FILE:LINE:in `test_assert_raises_trigger
      assert_equal expected, actual
    end
  
@@ -66,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"
-@@ -1041,7 +1041,7 @@ FILE:LINE:in `test_assert_raises_trigger
+@@ -1044,7 +1044,7 @@ FILE:LINE:in `test_assert_raises_trigger
      assert_equal expected, e.message
    end
  

-- 
ruby-minitest.git