summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-19 20:51:36 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-19 20:51:36 +0000
commit34b3f481dc2e92aaf477f4ec49a0b3bf0274bbf1 (patch)
tree62dc65bc538ba712f9c22972eb037a663cfa5f35
parenta6eb4609c215fb04b9b5a40bd065826c7b6f1954 (diff)
* test/xmlrpc/test_webrick_server.rb (setup_http_server):
should not include 'webrick/https' unless 'use_ssl' because it fails where openssl is not installed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/xmlrpc/test_webrick_server.rb16
2 files changed, 17 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b62a7d23a4..b4962d96960 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep 20 05:48:26 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * test/xmlrpc/test_webrick_server.rb (setup_http_server):
+ should not include 'webrick/https' unless 'use_ssl' because
+ it fails where openssl is not installed.
+
Tue Sep 20 01:01:41 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/mathn.rb (Fixnum): remove debug print.
diff --git a/test/xmlrpc/test_webrick_server.rb b/test/xmlrpc/test_webrick_server.rb
index e7fed016b09..4cd63cfa74f 100644
--- a/test/xmlrpc/test_webrick_server.rb
+++ b/test/xmlrpc/test_webrick_server.rb
@@ -33,13 +33,19 @@ class Test_Webrick < Test::Unit::TestCase
end
def setup_http_server(port, use_ssl)
- require 'webrick/https'
- start_server(
+ option = {
:Port => port,
:SSLEnable => use_ssl,
- :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE,
- :SSLCertName => []
- ) {|w| w.mount('/RPC2', create_servlet) }
+ }
+ if use_ssl
+ require 'webrick/https'
+ option.update(
+ :SSLVerifyClient => ::OpenSSL::SSL::VERIFY_NONE,
+ :SSLCertName => []
+ )
+ end
+
+ start_server(option) {|w| w.mount('/RPC2', create_servlet) }
@s = XMLRPC::Client.new3(:port => port, :use_ssl => use_ssl)
end