From 888362cc851d6921ed930b09c0317a37a2d4046d Mon Sep 17 00:00:00 2001 From: sorah Date: Wed, 2 Mar 2011 05:06:43 +0000 Subject: * test/testunit/test_parallel.rb(TestParallel#spawn_runner): Fix outputing empty line in running test. * test/testunit/tests_for_parallel/test_third.rb: Remove `sleep` git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/testunit/test_parallel.rb | 2 +- test/testunit/tests_for_parallel/test_third.rb | 4 ---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6fb5c9308b..3f7b221128 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Mar 2 14:02:29 2011 Shota Fukumori + + * test/testunit/test_parallel.rb(TestParallel#spawn_runner): + Fix outputing empty line in running test. + + * test/testunit/tests_for_parallel/test_third.rb: Remove `sleep` + Tue Mar 1 22:29:10 2011 Tanaka Akira * ext/openssl/ossl_pkey.h: parenthesize macro arguments. diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb index cd9587cee5..8a825e2803 100644 --- a/test/testunit/test_parallel.rb +++ b/test/testunit/test_parallel.rb @@ -129,7 +129,7 @@ module TestParallel def spawn_runner(*opt_args) @test_out, o = IO.pipe @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb", - "-j","t2","-x","sleeping",*opt_args, out: o, err: :out) + "-j","t2",*opt_args, out: o, err: o) o.close end diff --git a/test/testunit/tests_for_parallel/test_third.rb b/test/testunit/tests_for_parallel/test_third.rb index 6393130933..16bac16a04 100644 --- a/test/testunit/tests_for_parallel/test_third.rb +++ b/test/testunit/tests_for_parallel/test_third.rb @@ -2,10 +2,6 @@ require 'test/unit' require_relative "misc.rb" class TestD < TestCaseForParallelTest - def ptest_sleeping - sleep 2 - end - def ptest_fail_at_worker if MiniTest::Unit.output != STDOUT assert_equal(0,1) -- cgit v1.2.3