[DRE-commits] [SCM] ruby-minitest.git branch, master, updated. upstream/2.1.0-12-gafd9b1c

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 729284cf27ad7b627ce010db87e849b6bf8f8dab
Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
Date:   Sun Oct 9 12:47:19 2011 +0200

    disable-some-tests: Refresh patch.

diff --git a/debian/patches/disable-some-tests b/debian/patches/disable-some-tests
index 50c031e..0584510 100644
--- a/debian/patches/disable-some-tests
+++ b/debian/patches/disable-some-tests
@@ -1,9 +1,9 @@
 Description: Disable some broken tests
 Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
 ---
---- ruby-minitest-2.1.0.orig/test/test_minitest_unit.rb
-+++ ruby-minitest-2.1.0/test/test_minitest_unit.rb
-@@ -141,7 +141,7 @@ Finished tests in 0.00
+--- 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
  
@@ -12,7 +12,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      # 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'",
-@@ -170,7 +170,7 @@ Finished tests in 0.00
+@@ -171,7 +171,7 @@ Finished tests in 0.00
      assert_equal ex, fu
    end
  
@@ -21,7 +21,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      bt = (["#{MINITEST_BASE_DIR}/test.rb:165:in `__send__'"] +
            BT_MIDDLE +
            ["#{MINITEST_BASE_DIR}/mini/test.rb:29",
-@@ -183,7 +183,7 @@ Finished tests in 0.00
+@@ -184,7 +184,7 @@ Finished tests in 0.00
      assert_equal ex, fu
    end
  
@@ -30,7 +30,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 @@ RuntimeError: unhandled exception
+@@ -217,7 +217,7 @@ RuntimeError: unhandled exception
      assert_report expected
    end
  
@@ -39,7 +39,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      tc = Class.new(MiniTest::Unit::TestCase) do
        def test_something
          assert true
-@@ -249,7 +249,7 @@ RuntimeError: unhandled exception
+@@ -250,7 +250,7 @@ RuntimeError: unhandled exception
      assert_report expected
    end
  
@@ -48,7 +48,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      tc = Class.new(MiniTest::Unit::TestCase) do
        def test_something
          assert true
-@@ -692,7 +692,7 @@ class TestMiniTestUnitTestCase < MiniTes
+@@ -976,7 +976,7 @@ class TestMiniTestUnitTestCase < MiniTes
      end
    end
  
@@ -57,7 +57,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      e = assert_raises MiniTest::Assertion do
        @tc.assert_raises RuntimeError do
          raise SyntaxError, "icky"
-@@ -712,7 +712,7 @@ FILE:LINE:in `test_assert_raises_trigger
+@@ -996,7 +996,7 @@ FILE:LINE:in `test_assert_raises_trigger
      assert_equal expected, actual
    end
  
@@ -66,7 +66,7 @@ Author: Lucas Nussbaum <lucas at lucas-nussbaum.net>
      e = assert_raises MiniTest::Assertion do
        @tc.assert_raises RuntimeError, "XXX" do
          raise SyntaxError, "icky"
-@@ -757,7 +757,7 @@ FILE:LINE:in `test_assert_raises_trigger
+@@ -1041,7 +1041,7 @@ FILE:LINE:in `test_assert_raises_trigger
      assert_equal expected, e.message
    end
  

-- 
ruby-minitest.git