diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-06 18:12:03 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-09-07 08:53:08 +0900 |
| commit | c6b0bc0e3a2ca82c6e8fb1d3a7f29764b654ca23 (patch) | |
| tree | 18729cce2ddafda12d728804487dfa3677cb1ddb /test/test_ssl_session.rb | |
| parent | f69418511c707ac62cf7a23973a22865c8796ebe (diff) | |
| download | ruby-openssl-c6b0bc0e3a2ca82c6e8fb1d3a7f29764b654ca23.tar.gz | |
test/utils: make SSLTestCase#start_server take keyword arguments
Convert the two mandatory parameters, verify_mode and start_immediately,
into keyword arguments with a default value.
The verify_mode parameter is only useful for client certificate
authentication. So most test cases sets to OpenSSL::SSL::VERIFY_NONE.
Also the start_immediately option is usually set to true.
Diffstat (limited to 'test/test_ssl_session.rb')
| -rw-r--r-- | test/test_ssl_session.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_ssl_session.rb b/test/test_ssl_session.rb index 9bcec101..b2643edd 100644 --- a/test/test_ssl_session.rb +++ b/test/test_ssl_session.rb @@ -27,7 +27,7 @@ tddwpBAEDjcwMzA5NTYzMTU1MzAwpQMCARM= -----END SSL SESSION PARAMETERS----- SESSION - start_server(OpenSSL::SSL::VERIFY_NONE, true, :ignore_listener_error => true) { |_, port| + start_server(ignore_listener_error: true) { |_, port| ctx = OpenSSL::SSL::SSLContext.new ctx.session_cache_mode = OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT ctx.session_id_context = self.object_id.to_s @@ -46,7 +46,7 @@ tddwpBAEDjcwMzA5NTYzMTU1MzAwpQMCARM= def test_session Timeout.timeout(5) do - start_server(OpenSSL::SSL::VERIFY_NONE, true) do |server, port| + start_server do |server, port| sock = TCPSocket.new("127.0.0.1", port) ctx = OpenSSL::SSL::SSLContext.new("TLSv1") ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) @@ -154,7 +154,7 @@ __EOS__ def test_client_session last_session = nil - start_server(OpenSSL::SSL::VERIFY_NONE, true) do |server, port| + start_server do |server, port| 2.times do sock = TCPSocket.new("127.0.0.1", port) # Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?), @@ -237,7 +237,7 @@ __EOS__ end first_session = nil - start_server(OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc, :server_proc => server_proc) do |server, port| + start_server(ctx_proc: ctx_proc, server_proc: server_proc) do |server, port| 10.times do |i| sock = TCPSocket.new("127.0.0.1", port) ctx = OpenSSL::SSL::SSLContext.new @@ -285,7 +285,7 @@ __EOS__ # any resulting value is OK (ignored) } - start_server(OpenSSL::SSL::VERIFY_NONE, true) do |server, port| + start_server do |server, port| sock = TCPSocket.new("127.0.0.1", port) begin ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) @@ -344,7 +344,7 @@ __EOS__ c.session_cache_stats readwrite_loop(c, ssl) } - start_server(OpenSSL::SSL::VERIFY_NONE, true, :ctx_proc => ctx_proc, :server_proc => server_proc) do |server, port| + start_server(ctx_proc: ctx_proc, server_proc: server_proc) do |server, port| last_client_session = nil 3.times do sock = TCPSocket.new("127.0.0.1", port) |