diff options
| author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-02 05:06:43 +0000 |
|---|---|---|
| committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-02 05:06:43 +0000 |
| commit | 888362cc851d6921ed930b09c0317a37a2d4046d (patch) | |
| tree | 039e86e6674243ef6b61e9301e7c528245f28c1e /test/testunit | |
| parent | 66541b9a83357b58db25811e5a7b8e21159d2c52 (diff) | |
| download | ruby-888362cc851d6921ed930b09c0317a37a2d4046d.tar.gz | |
* 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
Diffstat (limited to 'test/testunit')
| -rw-r--r-- | test/testunit/test_parallel.rb | 2 | ||||
| -rw-r--r-- | test/testunit/tests_for_parallel/test_third.rb | 4 |
2 files changed, 1 insertions, 5 deletions
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) |