* test/testunit/test_parallel.rb, test/testunit/parallel/*:

	Test for r30939.
* lib/test/unit.rb: For test.
* lib/test/parallel.rb: For test.
* lib/test/unit/testcase.rb: For test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 3 deletions

diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 1272153c7b..6c4cecc442 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -87,7 +87,12 @@ module Test
         end
 
         opts.on '-j N', '--jobs N', "Allow run tests with N jobs at once" do |a|
-          options[:parallel] = a.to_i
+          if /^t/ =~ a
+            options[:testing] = true # For testing
+            options[:parallel] = a[1..-1].to_i
+          else
+            options[:parallel] = a.to_i
+          end
         end
 
         opts.on '--no-retry', "Don't retry running testcase when --jobs specified" do
diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb
index acfdc84bb4..ae1bf2961c 100644
--- a/lib/test/unit/parallel.rb
+++ b/lib/test/unit/parallel.rb
@@ -10,6 +10,7 @@ module Test
       alias orig_run_suite _run_suite
       undef _run_suite
       undef _run_suites
+      undef run
 
       def _run_suites suites, type
         suites.map do |suite|
@@ -42,13 +43,12 @@ module Test
         MiniTest::Unit.output = orig_stdout
 
         o.close
-        i.close
-
         begin
           th.join
         rescue IOError
           raise unless ["stream closed","closed stream"].include? $!.message
         end
+        i.close
 
         result << (report - r)
         result << [@errors-e,@failures-f,@skips-s]