summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@ruby-lang.org>2015-07-13 10:07:01 +0000
committernobu <nobu@ruby-lang.org>2015-07-13 10:07:01 +0000
commite94c189374544631f4e1c33cc97a4fac243ec861 (patch)
tree0b77feb34bc90543d92afce594f0d649f1e7ccef
parent75524c98217dc9eb6f5197bcdb6ed422fcd37457 (diff)
downloadruby-openssl-history-e94c189374544631f4e1c33cc97a4fac243ec861.tar.gz
use Timeout.timeout
* time: Object#timeout has been deprecated a long time ago, use Timeout.timeout. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/test_ssl_session.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_ssl_session.rb b/test/test_ssl_session.rb
index 16432bc..0c384c7 100644
--- a/test/test_ssl_session.rb
+++ b/test/test_ssl_session.rb
@@ -44,7 +44,7 @@ tddwpBAEDjcwMzA5NTYzMTU1MzAwpQMCARM=
end
def test_session
- timeout(5) do
+ Timeout.timeout(5) do
start_server(OpenSSL::SSL::VERIFY_NONE, true) do |server, port|
sock = TCPSocket.new("127.0.0.1", port)
ctx = OpenSSL::SSL::SSLContext.new("TLSv1")
@@ -361,7 +361,7 @@ __EOS__
ssl.connect
last_client_session = ssl.session
ssl.close
- timeout(5) do
+ Timeout.timeout(5) do
Thread.pass until called.key?(:new)
assert(called.delete(:new))
Thread.pass until called.key?(:remove)