[前][次][番号順一覧][スレッド一覧]

ruby-changes:21780

From: akr <ko1@a...>
Date: Thu, 24 Nov 2011 20:08:03 +0900 (JST)
Subject: [ruby-changes:21780] akr:r33829 (trunk): * test/openssl/test_engine.rb: use IO#reopen to restore stderr.

akr	2011-11-24 20:07:50 +0900 (Thu, 24 Nov 2011)

  New Revision: 33829

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

  Log:
    * test/openssl/test_engine.rb: use IO#reopen to restore stderr.

  Modified files:
    trunk/ChangeLog
    trunk/test/openssl/test_engine.rb
    trunk/test/ruby/test_io.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33828)
+++ ChangeLog	(revision 33829)
@@ -1,3 +1,7 @@
+Thu Nov 24 20:02:40 2011  Tanaka Akira  <akr@f...>
+
+	* test/openssl/test_engine.rb: use IO#reopen to restore stderr.
+
 Thu Nov 24 19:59:56 2011  Tanaka Akira  <akr@f...>
 
 	* io.c (rb_io_reopen): re-initialize buffereing mode for stdout and
Index: test/ruby/test_io.rb
===================================================================
--- test/ruby/test_io.rb	(revision 33828)
+++ test/ruby/test_io.rb	(revision 33829)
@@ -2157,4 +2157,13 @@
       }
     }
   end
+
+  def test_std_fileno
+    assert_equal(0, STDIN.fileno)
+    assert_equal(1, STDOUT.fileno)
+    assert_equal(2, STDERR.fileno)
+    assert_equal(0, $stdin.fileno)
+    assert_equal(1, $stdout.fileno)
+    assert_equal(2, $stderr.fileno)
+  end
 end
Index: test/openssl/test_engine.rb
===================================================================
--- test/openssl/test_engine.rb	(revision 33828)
+++ test/openssl/test_engine.rb	(revision 33829)
@@ -53,7 +53,10 @@
     assert_equal(data, decrypted)
     cleanup
   ensure
-    $stderr = err_back if err_back
+    if err_back
+      $stderr.reopen(err_back)
+      err_back.close
+    end
   end 
 
   private

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

[前][次][番号順一覧][スレッド一覧]