yugui	2011-01-16 21:35:39 +0900 (Sun, 16 Jan 2011)

  New Revision: 30577

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30577

  Log:
    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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/net/imap/test_imap.rb
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30576)
+++ ruby_1_9_2/ChangeLog	(revision 30577)
@@ -1,3 +1,8 @@
+Fri Jan 14 15:32:29 2011  Shugo Maeda  <shugo@r...>
+
+	* 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@r...>
 
 	* lib/net/imap.rb: use bytesize for binary strings.
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30576)
+++ ruby_1_9_2/version.h	(revision 30577)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 157
+#define RUBY_PATCHLEVEL 158
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/test/net/imap/test_imap.rb
===================================================================
--- ruby_1_9_2/test/net/imap/test_imap.rb	(revision 30576)
+++ ruby_1_9_2/test/net/imap/test_imap.rb	(revision 30577)
@@ -425,9 +425,9 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/