aboutsummaryrefslogtreecommitdiffstats
path: root/test/thread
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-13 10:07:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-13 10:07:01 +0000
commitbeb1c085d582b4ac187309560eb871dda5bc3c28 (patch)
tree70a84bbd1128ba33d3101bf9323a6977e6b2c754 /test/thread
parent42f1ff127249fe4d86c0f7b7ef2b920cbb71601b (diff)
downloadruby-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/thread')
-rw-r--r--test/thread/test_queue.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index 2bd71dbfc9..8fb0adca3f 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -239,7 +239,7 @@ class TestQueue < Test::Unit::TestCase
sleep 0.1
q << :s
assert_nothing_raised(Timeout::Error) do
- timeout(1) { th2.join }
+ Timeout.timeout(1) { th2.join }
end
ensure
[th1, th2].each do |th|