From 9d155ebf5142f3018b3d340d350f9d6ea326a2e0 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 14 Jan 2011 06:38:32 +0000
Subject: [PATCH] * 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/trunk@30544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                  | 5 +++++
 test/net/imap/test_imap.rb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d5f4e0d58..2ad2896d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 14 15:32:29 2011  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/net/imap/test_imap.rb: call neither logout nor disconnect
+	  unless connected.  patch by Kazuhiro NISHIYAMA.  [ruby-dev:42860]
+
 Fri Jan 14 14:56:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/net/imap.rb: use bytesize for binary strings.
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index 8ccec642c0..01982ab815 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -435,9 +435,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