diff options
author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-15 23:06:00 +0000 |
---|---|---|
committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-15 23:06:00 +0000 |
commit | ea11cf5d7f902609912652ad74586334638b4945 (patch) | |
tree | f74a879562d46e9fad06a21a0940fc9c5c89bd29 | |
parent | 6e125382d7af727f70063a8f5e5959744865c193 (diff) | |
download | ruby-ea11cf5d7f902609912652ad74586334638b4945.tar.gz |
* test/testunit/test_parallel.rb(test_ignore_tzero): Test for r32109.
* test/testunit/tests_for_parallel/test_third.rb: Use another way to
detect that test is running on worker. This fixes sometimes
TestParallel failing.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | test/testunit/test_parallel.rb | 11 | ||||
-rw-r--r-- | test/testunit/tests_for_parallel/test_third.rb | 2 |
3 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Thu Jun 16 07:58:01 2011 Shota Fukumori <sorah@tubusu.net> + + * test/testunit/test_parallel.rb(test_ignore_tzero): Test for r32109. + + * test/testunit/tests_for_parallel/test_third.rb: Use another way to + detect that test is running on worker. This fixes sometimes + TestParallel failing. + Thu Jun 16 07:20:06 2011 Shota Fukumori <sorah@tubusu.net> * lib/test/unit.rb(Test::Unit::Runner#_run_parallel): Ignore -j0 diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb index 2f114bba69..7a2e9aece6 100644 --- a/test/testunit/test_parallel.rb +++ b/test/testunit/test_parallel.rb @@ -140,8 +140,15 @@ module TestParallel end end - #def test_childs - #end + def test_ignore_jzero + @test_out, o = IO.pipe + @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb", + "-j","0", out: File::NULL, err: o) + o.close + timeout(10) { + assert_match(/Error: parameter of -j option should be greater than 0/,@test_out.read) + } + end def test_should_run_all_without_any_leaks spawn_runner diff --git a/test/testunit/tests_for_parallel/test_third.rb b/test/testunit/tests_for_parallel/test_third.rb index 16bac16a04..2746a9ba71 100644 --- a/test/testunit/tests_for_parallel/test_third.rb +++ b/test/testunit/tests_for_parallel/test_third.rb @@ -3,7 +3,7 @@ require_relative "misc.rb" class TestD < TestCaseForParallelTest def ptest_fail_at_worker - if MiniTest::Unit.output != STDOUT + if /test\/unit\/parallel\.rb/ =~ $0 assert_equal(0,1) end end |