diff options
author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-20 02:07:24 +0000 |
---|---|---|
committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-20 02:07:24 +0000 |
commit | 5f4b7f5afa7fb91d93192f32e6eaf0e4e2a95870 (patch) | |
tree | 5b9333c0e49c15f9a167f35e9688b7a61b9bb474 /lib/test/unit | |
parent | 8198cca945dba5bf43cd6bbca0d13add003f223d (diff) | |
download | ruby-5f4b7f5afa7fb91d93192f32e6eaf0e4e2a95870.tar.gz |
* 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
Diffstat (limited to 'lib/test/unit')
-rw-r--r-- | lib/test/unit/parallel.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/test/unit/parallel.rb b/lib/test/unit/parallel.rb index 232aa44151..32f15382ec 100644 --- a/lib/test/unit/parallel.rb +++ b/lib/test/unit/parallel.rb @@ -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 |