diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-13 21:34:20 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-13 21:34:20 +0000 |
| commit | a026ad4958fde552474d5873cc146ff291ba3bcc (patch) | |
| tree | 73348a2cf6a66b1f1d6620b93109b7f7dfb0ca03 /test/ruby/test_io.rb | |
| parent | fa66e11650a4b3ac4ab3b621630089540576d0b6 (diff) | |
| download | ruby-a026ad4958fde552474d5873cc146ff291ba3bcc.tar.gz | |
thread_pthread.c: eliminate timer thread by restructuring GVL
This reverts commit 194a6a2c68e9c8a3536b24db18ceac87535a6051 (r64203).
Race conditions which caused the original reversion will be fixed
in the subsequent commit.
[ruby-core:88360] [Misc #14937]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64352 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_io.rb')
| -rw-r--r-- | test/ruby/test_io.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index ea1dfc758c..cf8c9651b8 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -3564,7 +3564,8 @@ __END__ end def test_race_gets_and_close - assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}") + opt = { signal: :ABRT, timeout: 200 } + assert_separately([], "#{<<-"begin;"}\n#{<<-"end;"}", opt) bug13076 = '[ruby-core:78845] [Bug #13076]' begin; 10.times do |i| @@ -3586,9 +3587,9 @@ __END__ w.close r.close end - assert_nothing_raised(IOError, bug13076) { - t.each(&:join) - } + t.each do |th| + assert_same(th, th.join(2), bug13076) + end end end; end |