* test/ruby/test_io.rb (TestIO#test_dup): avoid infinite loop.

  [ruby-dev:36326]

* test/ruby/test_io.rb (TestIO#test_dup): remove needless open.
  [ruby-dev:35957]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index d1212ff80..8b43a05ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Sep 17 19:16:47 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_io.rb (TestIO#test_dup): avoid infinite loop.
+	  [ruby-dev:36326]
+
+	* test/ruby/test_io.rb (TestIO#test_dup): remove needless open.
+	  [ruby-dev:35957]
+
 Wed Sep 17 13:42:59 2008  Takeyuki Fujioka  <xibbar@ruby-lang.org>
 
 	* lib/cgi/html.rb (checkbox_group,radio_group): bug fix
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index ba85b847b..4d9bb51fe 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -624,16 +624,12 @@ class TestIO < Test::Unit::TestCase
       assert_equal("", f2.read)
     end
 
-    proc do
-      open(__FILE__) # see Bug #493 [ruby-dev:35957]
-    end.call
-
     a = []
     assert_raise(Errno::EMFILE, Errno::ENFILE, Errno::ENOMEM) do
       loop {a << IO.pipe}
     end
     assert_raise(Errno::EMFILE, Errno::ENFILE, Errno::ENOMEM) do
-      loop {a[-1][0].dup; a[-1][1].dup}
+      loop {a << [a[-1][0].dup, a[-1][1].dup]}
     end
     a.each do |r, w|
       r.close unless !r || r.closed?