diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-30 09:57:04 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-30 09:57:04 +0000 |
| commit | 1918ea16c788e6fcca468f4223bb24bb8b358f22 (patch) | |
| tree | b962a20e0cf10297eff2becda7647dc3471da364 /test/ruby | |
| parent | ea44d4d9d5ddb4102818c858cea91977469a3dc9 (diff) | |
* 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
Diffstat (limited to 'test/ruby')
| -rw-r--r-- | test/ruby/test_process.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 4f67cf36fd..0a6317aa54 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -1959,7 +1959,13 @@ EOS _, status = Process.wait2(runner.pid) rescue IO::WaitReadable => e 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 assert_predicate(status, :success?) ensure |