naruse	2012-04-20 09:22:11 +0900 (Fri, 20 Apr 2012)

  New Revision: 35409

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35409

  Log:
    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.

  Modified files:
    branches/ruby_1_9_3/test/rubygems/test_gem_security.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35408)
+++ ruby_1_9_3/version.h	(revision 35409)
@@ -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
Index: ruby_1_9_3/test/rubygems/test_gem_security.rb
===================================================================
--- ruby_1_9_3/test/rubygems/test_gem_security.rb	(revision 35408)
+++ ruby_1_9_3/test/rubygems/test_gem_security.rb	(revision 35409)
@@ -4,6 +4,16 @@
 
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/