diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-20 00:22:11 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-20 00:22:11 +0000 |
commit | 1abf777e3f98a10f8568206b7879212670e4451d (patch) | |
tree | 9057d9a1661a99f5deefb6428a4c3d128aea9c5a | |
parent | d927018018577e2fa8e0d0475c7f87c3a7e02302 (diff) |
merge revision(s) 35389:
Use mock of Gem::Security::OPT[:trust_dir]
Gem::Security::OPT[:trust_dir] depends Gem.user_home but doesn't reset
on setup/teardown.
NOTE: Gem.user_home won't be recovered now, so teardown doesn't work.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35409 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/rubygems/test_gem_security.rb | 10 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb index df3168dce4..625da8ae6d 100644 --- a/test/rubygems/test_gem_security.rb +++ b/test/rubygems/test_gem_security.rb @@ -4,6 +4,16 @@ require 'rubygems/fix_openssl_warnings' if RUBY_VERSION < "1.9" class TestGemSecurity < Gem::TestCase + def setup + super + Gem::Security::OPT[:trust_dir] = File.join(Gem.user_home, '.gem', 'trust') + end + + def teardown + super + Gem::Security::OPT[:trust_dir] = File.join(Gem.user_home, '.gem', 'trust') + end + def test_class_build_cert name = OpenSSL::X509::Name.parse "CN=nobody/DC=example" key = OpenSSL::PKey::RSA.new 512 @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 193 +#define RUBY_PATCHLEVEL 194 #define RUBY_RELEASE_DATE "2012-04-20" #define RUBY_RELEASE_YEAR 2012 |