summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-14 08:14:37 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-14 08:14:37 +0000
commite2aeaed63382217d3c1591a74fa68435173fd7fd (patch)
treecc79459bff9234f748800843cf3690c33e129c54 /test
parent3d55c375a1fc328999eba508e1c37669f599ffe0 (diff)
merge revision(s) 35636,35637: [Backport #6429]
* test/ruby/test_io.rb (TestIO): revert r35631. it broke the intent of test_flush_in_finalizer1. [ruby-core:43951] [Bug ##6228] * test/ruby/test_io.rb (test_flush_in_finalizer1): don't use IO.for_fd to close IO objects. it create IO object with already closed fd, and cause occasional Errno::EBADF in following tests. [ruby-core:45020] [Bug #6228] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35646 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_io.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 84a147aa06..36dab0815d 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -10,14 +10,6 @@ require 'weakref'
require_relative 'envutil'
class TestIO < Test::Unit::TestCase
- def setup
- GC.disable
- end
-
- def teardown
- GC.enable
- end
-
def have_close_on_exec?
begin
$stdin.close_on_exec?
@@ -1807,7 +1799,7 @@ End
}
end
ensure
- fds.each {|fd| IO.for_fd(fd).close rescue next}
+ GC.start
end
def test_flush_in_finalizer2