diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 16:03:27 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 16:03:27 +0000 |
commit | a48d15477e7cec8b9d497f36b9cbdff8f75142f3 (patch) | |
tree | 8d9638dfb08412d5ac27412ca70f0944a7ff94a7 /test | |
parent | 8a14ed3df5361398638a16597602b54f8421b905 (diff) |
merge revision(s) 57422: [Backport #13158]
io.c: close before wait
* io.c (io_close_fptr): notify then close, and wait for other
threads before free fptr. [ruby-core:79262] [Bug #13158]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@58094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_io.rb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 4d712ed099..6171db98f7 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -3207,4 +3207,25 @@ End end end; end + + def test_race_closed_stream + bug13158 = '[ruby-core:79262] [Bug #13158]' + closed = nil + IO.pipe do |r, w| + thread = Thread.new do + begin + while r.gets + end + ensure + closed = r.closed? + end + end + sleep 0.01 + r.close + assert_raise_with_message(IOError, /stream closed/) do + thread.join + end + assert_equal(true, closed, "#{bug13158}: stream should be closed") + end + end end |