diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-13 10:07:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-13 10:07:01 +0000 |
commit | beb1c085d582b4ac187309560eb871dda5bc3c28 (patch) | |
tree | 70a84bbd1128ba33d3101bf9323a6977e6b2c754 /test/openssl | |
parent | 42f1ff127249fe4d86c0f7b7ef2b920cbb71601b (diff) | |
download | ruby-beb1c085d582b4ac187309560eb871dda5bc3c28.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
Diffstat (limited to 'test/openssl')
-rw-r--r-- | test/openssl/test_ssl_session.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index 16432bcbb0..0c384c731a 100644 --- a/test/openssl/test_ssl_session.rb +++ b/test/openssl/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) |