From a13fa65fc7bf7c7f2b6a609dbbe1790b2d83ef65 Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 22 Sep 2005 07:44:32 +0000
Subject: * test/readline/test_readline.rb (TestReadline::replace_stdio):  
 merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                      |  5 +++++
 test/readline/test_readline.rb | 29 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 225623449..042b2b0a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 22 16:33:12 2005  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/readline/test_readline.rb (TestReadline::replace_stdio):
+	  merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
+
 Wed Sep 21 23:30:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): generalized nmake dependent code.
diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index ac2966b48..edc3aa09b 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -62,19 +62,22 @@ class TestReadline < Test::Unit::TestCase
   private
 
   def replace_stdio(stdin_path, stdout_path)
-    STDIN.seek(0, File::SEEK_SET) rescue nil
-    orig_stdin = STDIN.dup
-    orig_stdout = STDOUT.dup
-    STDIN.reopen(stdin_path, "r")
-    STDOUT.reopen(stdout_path, "w")
-    begin
-      yield
-    ensure
-      STDIN.reopen(orig_stdin)
-      STDOUT.reopen(orig_stdout)
-      orig_stdin.close
-      orig_stdout.close
-    end
+    open(stdin_path, "r"){|stdin|
+      open(stdout_path, "w"){|stdout|
+        orig_stdin = STDIN.dup
+        orig_stdout = STDOUT.dup
+        STDIN.reopen(stdin)
+        STDOUT.reopen(stdout)
+        begin
+          yield
+        ensure
+          STDIN.reopen(orig_stdin)
+          STDOUT.reopen(orig_stdout)
+          orig_stdin.close
+          orig_stdout.close
+        end
+      }
+    }
   end
 end
 
-- 
cgit