summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-16 12:35:39 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-16 12:35:39 +0000
commit457a6fda26873c0a3faa9f860a72e266715a969a (patch)
treed2947faa0322c4b6ea8e80b0d2684d466dafb486 /test
parent8de1ee21e45c66b51e0dbd3d49aa50e5f42ea2c3 (diff)
merges r30544 from trunk into ruby_1_9_2.
-- * test/net/imap/test_imap.rb: call neither logout nor disconnect unless connected. patch by Kazuhiro NISHIYAMA. [ruby-dev:42860] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/net/imap/test_imap.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index 06ecca0f00..f5ffc84e36 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -425,9 +425,9 @@ class IMAPTest < Test::Unit::TestCase
begin
begin
imap = yield(port)
- imap.logout
+ imap.logout if !imap.disconnected?
ensure
- imap.disconnect if imap
+ imap.disconnect if imap && !imap.disconnected?
end
ensure
server.close