summaryrefslogtreecommitdiff
path: root/test/rubygems/test_require.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-02-14 12:59:03 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-02-14 12:59:03 +0000
commit4ae3df42f723d25b0fe4ba6b2689d607b01c6f48 (patch)
tree26c5f5cf033f79373e63b10f684df07898b7cd8f /test/rubygems/test_require.rb
parentd1e6304a891fc5e9cc63e50520bdc798fb95b829 (diff)
Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c
This version contains the some style changes by RuboCop. * https://github.com/rubygems/rubygems/commit/9d810be0ede925fb2e3af535848582c3f8e0e72f * https://github.com/rubygems/rubygems/commit/61ea98a727fb1b76b6fac52d74107ee4b02aaef2 * https://github.com/rubygems/rubygems/commit/795893dce3c5f8540804fc08144cc6a90f086b13 * https://github.com/rubygems/rubygems/commit/9be7858f7f17eae3058204f3c03e4b798ba18b9c git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_require.rb')
-rw-r--r--test/rubygems/test_require.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index e3bdc218f7..846826c3f1 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -3,7 +3,9 @@ require 'rubygems/test_case'
require 'rubygems'
class TestGemRequire < Gem::TestCase
+
class Latch
+
def initialize(count = 1)
@count = count
@lock = Monitor.new
@@ -22,6 +24,7 @@ class TestGemRequire < Gem::TestCase
@cv.wait_while { @count > 0 }
end
end
+
end
def setup
@@ -331,8 +334,10 @@ class TestGemRequire < Gem::TestCase
def test_try_activate_error_unlocks_require_monitor
silence_warnings do
class << ::Gem
+
alias old_try_activate try_activate
def try_activate(*); raise 'raised from try_activate'; end
+
end
end
@@ -343,7 +348,9 @@ class TestGemRequire < Gem::TestCase
ensure
silence_warnings do
class << ::Gem
+
alias try_activate old_try_activate
+
end
end
Kernel::RUBYGEMS_ACTIVATION_MONITOR.exit
@@ -436,4 +443,5 @@ class TestGemRequire < Gem::TestCase
ensure
$VERBOSE = old_verbose
end
+
end