aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/test/unit/parallel.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb
index c5d07e673b..deda1d1ef5 100644
--- a/lib/test/unit/parallel.rb
+++ b/lib/test/unit/parallel.rb
@@ -26,9 +26,11 @@ module Test
def _run_suite(suite, type)
r = report.dup
- orig_stdout = MiniTest::Unit.output
+ orig_testout = MiniTest::Unit.output
i,o = IO.pipe
+
MiniTest::Unit.output = o
+ orig_stdin, orig_stdout = $stdin, $stdout
th = Thread.new do
begin
@@ -49,7 +51,9 @@ module Test
result = [nil,nil]
end
- MiniTest::Unit.output = orig_stdout
+ MiniTest::Unit.output = orig_testout
+ $stdin = orig_stdin
+ $stdout = orig_stdout
o.close
begin
@@ -70,6 +74,8 @@ module Test
return result
ensure
MiniTest::Unit.output = orig_stdout
+ $stdin = orig_stdin
+ $stdout = orig_stdout
o.close if o && !o.closed?
i.close if i && !i.closed?
end