kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

fix concurrent test.

Browse source 
* test/rubygems/test_require.rb (test_concurrent_require):
  Synchronizations should be in ensure clause. Sometimes
  `require` fails (not sure why) and latch is not released.
  Such case introduces unlimited awaiting.
  This patch soleve this problem.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2017-12-27 14:50:49 +00:00
parent ecbb128273
commit f8fac84c7b
1 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/rubygems/test_require.rb
View file

@ -38,18 +38,6 @@ class TestGemRequire < Gem::TestCase
assert require(path), "'#{path}' was already required"
end
def append_latch spec
dir = spec.gem_dir
Dir.chdir dir do
spec.files.each do |file|
File.open file, 'a' do |fp|
fp.puts "FILE_ENTERED_LATCH.release"
fp.puts "FILE_EXIT_LATCH.await"
end
end
end
end
# Providing -I on the commandline should always beat gems
def test_dash_i_beats_gems
a1 = new_spec "a", "1", {"b" => "= 1"}, "lib/test_gem_require_a.rb"
@ -80,6 +68,15 @@ class TestGemRequire < Gem::TestCase
Object.send :remove_const, :HELLO if Object.const_defined? :HELLO
end
def create_sync_thread
Thread.new do
yield
ensure
FILE_ENTERED_LATCH.release
FILE_EXIT_LATCH.await
end
end
def test_concurrent_require
skip 'deadlock' if /^1\.8\./ =~ RUBY_VERSION
@ -91,11 +88,8 @@ class TestGemRequire < Gem::TestCase
install_specs a1, b1
append_latch a1
append_latch b1
t1 = Thread.new { assert_require 'a' }
t2 = Thread.new { assert_require 'b' }
t1 = create_sync_thread{ assert_require 'a' }
t2 = create_sync_thread{ assert_require 'b' }
# wait until both files are waiting on the exit latch
FILE_ENTERED_LATCH.await
@ -106,8 +100,6 @@ class TestGemRequire < Gem::TestCase
assert t1.join, "thread 1 should exit"
assert t2.join, "thread 2 should exit"
ensure
return if $! # skipping
Object.send :remove_const, :FILE_ENTERED_LATCH
Object.send :remove_const, :FILE_EXIT_LATCH
end