* test/net/imap/test_imap.rb: resurrection of r29259.

this change depends on minitest 1.7.1.

	* lib/test/unit/assertions.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-09-27 06:28:59 +00:00
Родитель ae9264678c
Коммит 36cfaa8052
3 изменённых файлов: 25 добавлений и 6 удалений

Просмотреть файл

@ -1,3 +1,10 @@
Mon Sep 27 15:25:05 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* test/net/imap/test_imap.rb: resurrection of r29259.
this change depends on minitest 1.7.1.
* lib/test/unit/assertions.rb: ditto.
Sun Sep 26 22:59:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Sep 26 22:59:45 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/config.sub (x86_64-pc-mingw64): regularize. * tool/config.sub (x86_64-pc-mingw64): regularize.

Просмотреть файл

@ -32,6 +32,8 @@ 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)

Просмотреть файл

@ -49,9 +49,13 @@ 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
@ -61,9 +65,13 @@ 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
@ -104,6 +112,8 @@ 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