summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-27 06:32:59 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-27 06:32:59 +0000
commitcc02a4ab7b71215de89c6bcfddc2fb2ef6f587be (patch)
tree6b523fa91753ffbef1ce982a61db5a16f34b54ff
parentaac7837c764443894c8818f5e6ac862ad7692ecd (diff)
* lib/rubygems/test_case.rb: rescue Gem::LoadError in Gem::TestCase.
because it's effected by removing minitest from stdlib. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/rubygems/test_case.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aecb21a586..aef850636d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 27 15:20:12 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * lib/rubygems/test_case.rb: rescue Gem::LoadError in Gem::TestCase.
+ because it's effected by removing minitest from stdlib.
+
Fri Jun 27 12:29:37 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/rubygems/specification.rb: fixed broken condition caused
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 328731d4ea..74cb4c98d1 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -2,7 +2,7 @@
begin
gem 'minitest', '~> 4.0'
-rescue NoMethodError
+rescue NoMethodError, Gem::LoadError
# for ruby tests
end