1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/test/unit.rb, lib/test/unit/parallel.rb:

generate error message (String) in parallel.rb instead of
  marshalling Exception. Fixes [Bug #6882] [ruby-dev:46054]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
sorah 2012-08-20 02:07:24 +00:00
parent 8198cca945
commit 5f4b7f5afa
3 changed files with 11 additions and 6 deletions

View file

@ -1,3 +1,9 @@
Mon Aug 20 10:51:01 2012 Shota Fukumori <sorah@tubusu.net>
* lib/test/unit.rb, lib/test/unit/parallel.rb:
generate error message (String) in parallel.rb instead of
marshalling Exception. Fixes [Bug #6882] [ruby-dev:46054]
Sun Aug 19 01:24:32 2012 Ayumu AIZAWA <ayumu.aizawa@gmail.com>
* enum.c: fix docs. https://github.com/ruby/ruby/pull/129 by

View file

@ -370,11 +370,7 @@ module Test
def after_worker_down(worker, e=nil, c=false)
return unless @options[:parallel]
return if @interrupt
if e
b = e.backtrace
warn "#{b.shift}: #{e.message} (#{e.class})"
STDERR.print b.map{|s| "\tfrom #{s}"}.join("\n")
end
warn e if e
@need_quit = true
warn ""
warn "Some worker was crashed. It seems ruby interpreter's bug"

View file

@ -137,7 +137,10 @@ module Test
rescue Errno::EPIPE
rescue Exception => e
begin
_report "bye", Marshal.dump(e)
trace = e.backtrace
err = ["#{trace.shift}: #{e.message} (#{e.class})"] + trace.map{|t| t.prepend("\t") }
_report "bye", Marshal.dump(err.join("\n"))
rescue Errno::EPIPE;end
exit
ensure