From d0ca1c30598c3fc23ac85258afb188638df1a9fd Mon Sep 17 00:00:00 2001
From: Hiroshi Shirosaki <h.shirosaki@gmail.com>
Date: Tue, 22 Apr 2014 18:26:04 +0900
Subject: [PATCH] test-all parallel fails if a test is skipped after raise

DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
But it causes Mashal.load failure due to undefined class/module
DL::DLError when doing test-all parallel and test-all doesn't
complete. We create new MiniTest::Skip object to avoid Mashal.load
failure. I added a test for the bug.
---
 lib/test/unit/parallel.rb                       | 5 +++++
 test/testunit/test_parallel.rb                  | 9 +++++----
 test/testunit/tests_for_parallel/ptest_forth.rb | 8 ++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb
index c1ecf29..92cc7ec 100644
--- a/lib/test/unit/parallel.rb
+++ b/lib/test/unit/parallel.rb
@@ -155,6 +155,11 @@ module Test
       end
 
       def puke(klass, meth, e) # :nodoc:
+        if e.is_a?(MiniTest::Skip)
+          new_e = MiniTest::Skip.new(e.message)
+          new_e.set_backtrace(e.backtrace)
+          e = new_e
+        end
         @partial_report << [klass.name, meth, e.is_a?(MiniTest::Assertion) ? e : ProxyError.new(e)]
         super
       end
diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb
index f1b903b..6276aac 100644
--- a/test/testunit/test_parallel.rb
+++ b/test/testunit/test_parallel.rb
@@ -90,7 +90,7 @@ module TestParallel
     def test_done
       timeout(10) do
         @worker_in.puts "run #{TESTS}/ptest_forth.rb test"
-        6.times { @worker_out.gets }
+        7.times { @worker_out.gets }
         buf = @worker_out.gets
         assert_match(/^done (.+?)$/, buf)
 
@@ -98,7 +98,7 @@ module TestParallel
 
         result = Marshal.load($1.chomp.unpack("m")[0])
 
-        assert_equal(4, result[0])
+        assert_equal(5, result[0])
         assert_equal(2, result[1])
         assert_kind_of(Array,result[2])
         assert_kind_of(Array,result[3])
@@ -106,7 +106,8 @@ module TestParallel
         assert_kind_of(Array,result[2][1])
         assert_kind_of(MiniTest::Assertion,result[2][0][2])
         assert_kind_of(MiniTest::Skip,result[2][1][2])
-        assert_kind_of(Exception, result[2][2][2])
+        assert_kind_of(MiniTest::Skip,result[2][2][2])
+        assert_kind_of(Exception, result[2][3][2])
         assert_equal(result[5], "TestE")
       end
     end
@@ -156,7 +157,7 @@ module TestParallel
     def test_should_run_all_without_any_leaks
       spawn_runner
       buf = timeout(10){@test_out.read}
-      assert_match(/^[SFE\.]{8}$/,buf)
+      assert_match(/^[SFE\.]{9}$/,buf)
     end
 
     def test_should_retry_failed_on_workers
diff --git a/test/testunit/tests_for_parallel/ptest_forth.rb b/test/testunit/tests_for_parallel/ptest_forth.rb
index ad5a7f3..46c88da 100644
--- a/test/testunit/tests_for_parallel/ptest_forth.rb
+++ b/test/testunit/tests_for_parallel/ptest_forth.rb
@@ -15,6 +15,14 @@ class TestE < Test::Unit::TestCase
     assert_equal(0,1)
   end
 
+  def test_skip_after_unknown_error
+    begin
+      raise UnknownError, "unknown error"
+    rescue
+      skip "after raise"
+    end
+  end
+
   def test_unknown_error
     raise UnknownError, "unknown error"
   end
-- 
1.9.2.msysgit.0