diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | lib/test/unit/parallel.rb | 6 | ||||
| -rw-r--r-- | lib/test/unit/testcase.rb | 4 | ||||
| -rw-r--r-- | test/testunit/test_parallel.rb | 5 | ||||
| -rw-r--r-- | test/testunit/tests_for_parallel/test_third.rb | 3 |
5 files changed, 27 insertions, 4 deletions
@@ -1,3 +1,16 @@ +Thu Jun 16 20:06:15 2011 Shota Fukumori <sorah@tubusu.net> + + * test/testunit/test_parallel.rb: Fix Regexp for test. + + * test/testunit/tests_for_parallel/test_third.rb: Use + Test::Unit::TestCase#on_parallel_worker? for detecting worker. + + * lib/test/unit/testcase.rb(Test::Unit::TestCase#on_parallel_worker?): + New Method Test::Unit::TestCase#on_parallel_worker? returns true + when a testcase is running on parallel worker. + * lib/test/unit/parallel.rb(Test::Unit::TestCase#on_parallel_worker?): + ditto. + Thu Jun 16 19:27:12 2011 Hiroshi Nakamura <nahi@ruby-lang.org> * test/test_securerandom.rb: Add testcase. This testcase does NOT aim diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb index deda1d1ef5..ab9e864509 100644 --- a/lib/test/unit/parallel.rb +++ b/lib/test/unit/parallel.rb @@ -2,6 +2,12 @@ require 'test/unit' module Test module Unit + class TestCase < MiniTest::Unit::TestCase + def on_parallel_worker? + true + end + end + class Worker < Runner class << self undef autorun diff --git a/lib/test/unit/testcase.rb b/lib/test/unit/testcase.rb index f3d77744eb..02f0f97987 100644 --- a/lib/test/unit/testcase.rb +++ b/lib/test/unit/testcase.rb @@ -8,6 +8,10 @@ module Test class TestCase < MiniTest::Unit::TestCase include Assertions + def on_parallel_worker? + false + end + def run runner @options = runner.options super runner diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb index 7a2e9aece6..4c4d14b226 100644 --- a/test/testunit/test_parallel.rb +++ b/test/testunit/test_parallel.rb @@ -122,7 +122,7 @@ module TestParallel def spawn_runner(*opt_args) @test_out, o = IO.pipe @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb", - "-j","t2",*opt_args, out: o, err: o) + "-j","t1",*opt_args, out: o, err: o) o.close end @@ -153,14 +153,13 @@ module TestParallel def test_should_run_all_without_any_leaks spawn_runner buf = timeout(10){@test_out.read} - assert_match(/^\.*(\.SF\.*F|F\.*\.+SF)\.*$/,buf) + assert_match(/^[SF\.]{7}$/,buf) end def test_should_retry_failed_on_workers spawn_runner buf = timeout(10){@test_out.read} assert_match(/^Retrying\.+$/,buf) - assert_match(/^\.*SF\.*$/,buf) end def test_no_retry_option diff --git a/test/testunit/tests_for_parallel/test_third.rb b/test/testunit/tests_for_parallel/test_third.rb index 2746a9ba71..61124b291a 100644 --- a/test/testunit/tests_for_parallel/test_third.rb +++ b/test/testunit/tests_for_parallel/test_third.rb @@ -3,7 +3,8 @@ require_relative "misc.rb" class TestD < TestCaseForParallelTest def ptest_fail_at_worker - if /test\/unit\/parallel\.rb/ =~ $0 + #if /test\/unit\/parallel\.rb/ =~ $0 + if on_parallel_worker? assert_equal(0,1) end end |