mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/test/unit/assertions.rb (assert_nothing_raised): removes the
current trace to get rid of an issue of MiniTest::Unit#location. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
9aa8fcde55
commit
6b0304a5d7
2 changed files with 18 additions and 3 deletions
|
@ -1,3 +1,12 @@
|
|||
Mon Jan 12 17:23:05 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* lib/test/unit/assertions.rb (assert_nothing_raised): removes the
|
||||
current trace to get rid of an issue of MiniTest::Unit#location.
|
||||
|
||||
Mon Jan 12 16:49:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* instruby.rb (install): erased a garbage.
|
||||
|
||||
Mon Jan 12 16:45:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* win32/win32.c (open_dir_handle): extracted from rb_w32_opendir.
|
||||
|
|
|
@ -22,12 +22,18 @@ module Test
|
|||
msg = args.pop
|
||||
end
|
||||
begin
|
||||
yield
|
||||
line = __LINE__; yield
|
||||
rescue Exception => e
|
||||
if ((args.empty? && !e.instance_of?(MiniTest::Assertion)) ||
|
||||
bt = e.backtrace
|
||||
as = e.instance_of?(MiniTest::Assertion)
|
||||
if as
|
||||
ans = /\A#{Regexp.quote(__FILE__)}:#{line}:in /o
|
||||
bt.reject! {|line| ans =~ line}
|
||||
end
|
||||
if ((args.empty? && !as) ||
|
||||
args.any? {|a| a.instance_of?(Module) ? e.is_a?(a) : e.class == a })
|
||||
msg = message(msg) { "Exception raised:\n<#{mu_pp(e)}>" }
|
||||
raise MiniTest::Assertion, msg.call, e.backtrace
|
||||
raise MiniTest::Assertion, msg.call, bt
|
||||
else
|
||||
raise
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue