* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):

Don't raise Interrupt.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-11-30 09:57:04 +00:00
parent ea44d4d9d5
commit 1918ea16c7
2 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,8 @@
Sun Nov 30 18:55:32 2014 Tanaka Akira <akr@fsij.org>
* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
Don't raise Interrupt.
Sun Nov 30 17:11:05 2014 Tanaka Akira <akr@fsij.org> Sun Nov 30 17:11:05 2014 Tanaka Akira <akr@fsij.org>
* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): Use * test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): Use

View File

@ -1959,7 +1959,13 @@ EOS
_, status = Process.wait2(runner.pid) _, status = Process.wait2(runner.pid)
rescue IO::WaitReadable => e rescue IO::WaitReadable => e
Process.kill(:INT, runner.pid) Process.kill(:INT, runner.pid)
raise Marshal.load(er.read.unpack("m")[0]) exc = Marshal.load(er.read.unpack("m")[0])
if exc.kind_of? Interrupt
# Don't raise Interrupt. It aborts test-all.
flunk "timeout"
else
raise exc
end
end end
assert_predicate(status, :success?) assert_predicate(status, :success?)
ensure ensure