summaryrefslogtreecommitdiff
path: root/test/net/imap
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-05 17:18:09 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-05 17:18:09 +0000
commit786e7aba7fcc1fbce5b4f8bacacf1fd008b8341f (patch)
tree92e08b214958f17ae0240f8e67376ad0a322128e /test/net/imap
parent3b1371473805058fb41760a6f7628e12823f80e6 (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@16302 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/net/imap')
-rw-r--r--test/net/imap/test_imap.rb23
1 files changed, 17 insertions, 6 deletions
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index bc36f103e3d..c164875c424 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