From 33e39a76578517f0eb70f538e032c8dfc3416173 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 15 Aug 2015 04:34:07 +0000 Subject: use assert_raise * test/openssl/test_ssl.rb: use assert_raise instead of a deprecated method. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/test_ssl.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/openssl/test_ssl.rb') diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 857e6e813b..c08842ac5e 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -33,7 +33,7 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase ctx = OpenSSL::SSL::SSLContext.new options = ctx.options ctx.setup - assert_raises(RuntimeError) do + assert_raise(RuntimeError) do ctx.options = options end end @@ -707,12 +707,12 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase s1 = OpenSSL::SSL::SSLSocket.new(sock1, ctx1) s1.hostname = hostname t = Thread.new { - assert_raises(OpenSSL::SSL::SSLError) do + assert_raise(OpenSSL::SSL::SSLError) do s1.connect end } - assert_raises(ArgumentError) do + assert_raise(ArgumentError) do s2.accept end @@ -1029,7 +1029,7 @@ if OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10002000 ctx_proc = Proc.new { |ctx| ctx.alpn_select_cb = -> (protocols) { nil } } - assert_raises(MiniTest::Assertion) do # minitest/assertion comes from `assert_join_threads` + assert_raise(MiniTest::Assertion) do # minitest/assertion comes from `assert_join_threads` start_server_version(:SSLv23, ctx_proc) { |server, port| ctx = OpenSSL::SSL::SSLContext.new ctx.alpn_protocols = ["http/1.1"] -- cgit v1.2.3