nobu	2012-05-09 13:26:29 +0900 (Wed, 09 May 2012)

  New Revision: 35602

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

  Log:
    * test/rubygems/test_gem_remote_fetcher.rb: skip OpenSSL dependent
      tests if not available.

  Modified files:
    trunk/ChangeLog
    trunk/test/rubygems/test_gem_remote_fetcher.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35601)
+++ ChangeLog	(revision 35602)
@@ -1,3 +1,8 @@
+Wed May  9 13:26:25 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/rubygems/test_gem_remote_fetcher.rb: skip OpenSSL dependent
+	  tests if not available.
+
 Wed May  9 08:09:38 2012  Ryan Davis  <ryand-ruby@z...>
 
 	* lib/minitest/*: Imported minitest 3.0.0 (r7435)
Index: test/rubygems/test_gem_remote_fetcher.rb
===================================================================
--- test/rubygems/test_gem_remote_fetcher.rb	(revision 35601)
+++ test/rubygems/test_gem_remote_fetcher.rb	(revision 35602)
@@ -1,7 +1,10 @@
 require 'rubygems/test_case'
 require 'ostruct'
 require 'webrick'
-require 'webrick/https'
+begin
+  require 'webrick/https'
+rescue LoadError
+end
 require 'rubygems/remote_fetcher'
 require 'rubygems/format'
 
@@ -749,7 +752,7 @@
     with_configured_fetcher(":ssl_ca_cert: #{temp_ca_cert}") do |fetcher|
       fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
     end
-  end
+  end if defined?(OpenSSL::PKey)
 
   def test_do_not_allow_insecure_ssl_connection_by_default
     ssl_server = self.class.start_ssl_server
@@ -758,14 +761,14 @@
         fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
       end
     end
-  end
+  end if defined?(OpenSSL::PKey)
 
   def test_ssl_connection_allow_verify_none
     ssl_server = self.class.start_ssl_server
     with_configured_fetcher(":ssl_verify_mode: 0") do |fetcher|
       fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/yaml")
     end
-  end
+  end if defined?(OpenSSL::PKey)
 
   def test_do_not_follow_insecure_redirect
     ssl_server = self.class.start_ssl_server
@@ -775,7 +778,7 @@
         fetcher.fetch_path("https://localhost:#{ssl_server.config[:Port]}/insecure_redirect?to=#{@server_uri}")
       end
     end
-  end
+  end if defined?(OpenSSL::PKey)
 
   def with_configured_fetcher(config_str = nil, &block)
     if config_str
@@ -853,7 +856,7 @@
     end
 
     DIR = File.expand_path(File.dirname(__FILE__))
-    DH_PARAM = OpenSSL::PKey::DH.new(128)
+    DH_PARAM = defined?(OpenSSL::PKey) ? OpenSSL::PKey::DH.new(128) : nil
 
     def start_ssl_server(config = {})
       null_logger = NilLog.new
@@ -891,7 +894,7 @@
         end
       end
       server
-    end
+    end if DH_PARAM
 
 
 

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