From 77ffa600086088f8f9b726e8f15cd83f2ea61d2c Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 5 May 2008 17:18:09 +0000 Subject: * test/io/nonblock/test_flush.rb: don't set Thread.abort_on_exception. * test/net/imap/test_imap.rb: ensure disconnecting imap to terminate receiver thread.. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/io/nonblock/test_flush.rb | 1 - test/net/imap/test_imap.rb | 23 +++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/io/nonblock/test_flush.rb b/test/io/nonblock/test_flush.rb index 67ac1fcaa..b41afe110 100644 --- a/test/io/nonblock/test_flush.rb +++ b/test/io/nonblock/test_flush.rb @@ -5,7 +5,6 @@ begin rescue LoadError end -Thread.abort_on_exception = true class TestIONonblock < Test::Unit::TestCase def test_flush r,w = IO.pipe diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb index bc36f103e..c164875c4 100644 --- a/test/net/imap/test_imap.rb +++ b/test/net/imap/test_imap.rb @@ -67,6 +67,7 @@ class IMAPTest < Test::Unit::TestCase end def test_starttls + imap = nil if defined?(OpenSSL) starttls_test do |port| imap = Net::IMAP.new("localhost", :port => port) @@ -74,6 +75,10 @@ class IMAPTest < Test::Unit::TestCase imap end end + ensure + if imap && !imap.disconnected? + imap.disconnect + end end private @@ -105,9 +110,12 @@ class IMAPTest < Test::Unit::TestCase end end begin - imap = yield(port) - imap.logout - imap.disconnect + begin + imap = yield(port) + imap.logout + ensure + imap.disconnect if imap + end ensure ssl_server.close end @@ -143,9 +151,12 @@ class IMAPTest < Test::Unit::TestCase end end begin - imap = yield(port) - imap.logout - imap.disconnect + begin + imap = yield(port) + imap.logout + ensure + imap.disconnect if imap + end ensure server.close end -- cgit