1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverting; http://rubyforge.org/tracker/?func=detail&atid=4099&aid=28566&group_id=1040

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-09-15 07:56:04 +00:00
parent 6bab4ea991
commit cc9b6ba611
4 changed files with 6 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,14 +1,3 @@
Wed Sep 15 14:59:49 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
should properly ignore MiniTest::Skip
* lib/minitest/unit.rb (MiniTest::Assertions::assert_raises):
ditto.
* test/net/imap/test_imap.rb: Properly skip SSL tests when
localhost is not 127.0.0.1.
Wed Sep 15 13:37:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org> Wed Sep 15 13:37:00 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* test/net/imap/test_imap.rb: "localhost" not guaranteed to * test/net/imap/test_imap.rb: "localhost" not guaranteed to

2
lib/minitest/unit.rb
View File

@ -222,8 +222,6 @@ module MiniTest
begin begin
yield yield
should_raise = true should_raise = true
rescue MiniTest::Skip
raise
rescue Exception => e rescue Exception => e
details = "#{msg}#{mu_pp(exp)} exception expected, not" details = "#{msg}#{mu_pp(exp)} exception expected, not"
assert(exp.any? { |ex| assert(exp.any? { |ex|

2
lib/test/unit/assertions.rb
View File

@ -32,8 +32,6 @@ module Test
end end
begin begin
line = __LINE__; yield line = __LINE__; yield
rescue MiniTest::Skip
raise
rescue Exception => e rescue Exception => e
bt = e.backtrace bt = e.backtrace
as = e.instance_of?(MiniTest::Assertion) as = e.instance_of?(MiniTest::Assertion)

10
test/net/imap/test_imap.rb
View File

@ -49,13 +49,9 @@ class IMAPTest < Test::Unit::TestCase
if defined?(OpenSSL) if defined?(OpenSSL)
assert_raise(OpenSSL::SSL::SSLError) do assert_raise(OpenSSL::SSL::SSLError) do
imaps_test do |port| imaps_test do |port|
begin
Net::IMAP.new("localhost", Net::IMAP.new("localhost",
:port => port, :port => port,
:ssl => true) :ssl => true)
rescue SystemCallError
skip $!
end
end end
end end
end end
@ -65,13 +61,9 @@ class IMAPTest < Test::Unit::TestCase
if defined?(OpenSSL) if defined?(OpenSSL)
assert_nothing_raised do assert_nothing_raised do
imaps_test do |port| imaps_test do |port|
begin
Net::IMAP.new("localhost", Net::IMAP.new("localhost",
:port => port, :port => port,
:ssl => { :ca_file => CA_FILE }) :ssl => { :ca_file => CA_FILE })
rescue SystemCallError
skip $!
end
end end
end end
end end
@ -112,8 +104,6 @@ class IMAPTest < Test::Unit::TestCase
imap imap
end end
end end
rescue SystemCallError
skip $!
ensure ensure
if imap && !imap.disconnected? if imap && !imap.disconnected?
imap.disconnect imap.disconnect