diff options
author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-01 12:54:39 +0000 |
---|---|---|
committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-01 12:54:39 +0000 |
commit | 0a9442983d5194f3975e93c6af6dd025be45ebc2 (patch) | |
tree | 55dd8045ffe27e8869a37e8243d055f62eb34450 /test/testunit | |
parent | af3e36158fd820634cfed1ad318c87152690d086 (diff) | |
download | bundler-0a9442983d5194f3975e93c6af6dd025be45ebc2.tar.gz |
* lib/test/unit/parallel.rb: For Windows.
* test/testunit/test_parallel.rb(TestParallelWorker#test_quit_in_test):
Fix for above specification change.
* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
Fix outputing empty line in running test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/testunit')
-rw-r--r-- | test/testunit/test_parallel.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb index 8f921e01d1..cd9587cee5 100644 --- a/test/testunit/test_parallel.rb +++ b/test/testunit/test_parallel.rb @@ -117,14 +117,6 @@ module TestParallel assert_match(/^bye$/m,@worker_out.read) end end - - def test_quit_in_test - timeout(10) do - @worker_in.puts "run #{TESTS}/test_third.rb ptest" - @worker_in.puts "quit" - assert_match(/^ready\nokay\nbye/m,@worker_out.read) - end - end end class TestParallel < Test::Unit::TestCase @@ -137,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) + "-j","t2","-x","sleeping",*opt_args, out: o, err: :out) o.close end |