From af3a13fd44a3a818291c0541760929407b35d4b8 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 9 May 2016 00:05:30 +0000 Subject: test_ssl_server.rb: assert_self_signed_cert * test/webrick/test_ssl_server.rb (assert_self_signed_cert): extract common assertion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/webrick/test_ssl_server.rb | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/test/webrick/test_ssl_server.rb b/test/webrick/test_ssl_server.rb index de685bb6d3..994fde7a1b 100644 --- a/test/webrick/test_ssl_server.rb +++ b/test/webrick/test_ssl_server.rb @@ -13,24 +13,20 @@ class TestWEBrickSSLServer < Test::Unit::TestCase end def test_self_signed_cert_server - config = { + assert_self_signed_cert( :SSLEnable => true, - :SSLCertName => [["C", "JP"], ["O", "www.ruby-lang.org"], ["CN", "Ruby"]] - } - TestWEBrick.start_server(Echo, config){|server, addr, port, log| - sock = OpenSSL::SSL::SSLSocket.new(TCPSocket.new(addr, port)) - sock.connect - sock.puts(server.ssl_context.cert.subject.to_s) - assert_equal("/C=JP/O=www.ruby-lang.org/CN=Ruby\n", sock.gets, log.call) - sock.close - } + :SSLCertName => [["C", "JP"], ["O", "www.ruby-lang.org"], ["CN", "Ruby"]], + ) end def test_self_signed_cert_server_with_string - config = { + assert_self_signed_cert( :SSLEnable => true, - :SSLCertName => "/C=JP/O=www.ruby-lang.org/CN=Ruby" - } + :SSLCertName => "/C=JP/O=www.ruby-lang.org/CN=Ruby", + ) + end + + def assert_self_signed_cert(config) TestWEBrick.start_server(Echo, config){|server, addr, port, log| sock = OpenSSL::SSL::SSLSocket.new(TCPSocket.new(addr, port)) sock.connect -- cgit v1.2.3