From beb1c085d582b4ac187309560eb871dda5bc3c28 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 13 Jul 2015 10:07:01 +0000 Subject: 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 --- test/rubygems/test_gem_request_connection_pools.rb | 2 +- test/rubygems/test_gem_stream_ui.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'test/rubygems') diff --git a/test/rubygems/test_gem_request_connection_pools.rb b/test/rubygems/test_gem_request_connection_pools.rb index 403f7679f8..1944a4f351 100644 --- a/test/rubygems/test_gem_request_connection_pools.rb +++ b/test/rubygems/test_gem_request_connection_pools.rb @@ -118,7 +118,7 @@ class TestGemRequestConnectionPool < Gem::TestCase pool.checkout t1 = Thread.new { - timeout(1) do + Timeout.timeout(1) do pool.checkout end } diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb index f4835685a1..bea187e8f3 100644 --- a/test/rubygems/test_gem_stream_ui.rb +++ b/test/rubygems/test_gem_stream_ui.rb @@ -38,7 +38,7 @@ class TestGemStreamUI < Gem::TestCase skip 'TTY detection broken on windows' if Gem.win_platform? unless RUBY_VERSION > '1.9.2' - timeout(1) do + Timeout.timeout(1) do expected_answer = "Arthur, King of the Britons" @in.string = "#{expected_answer}\n" actual_answer = @sui.ask("What is your name?") @@ -52,7 +52,7 @@ class TestGemStreamUI < Gem::TestCase @in.tty = false - timeout(0.1) do + Timeout.timeout(0.1) do answer = @sui.ask("what is your favorite color?") assert_equal nil, answer end @@ -62,7 +62,7 @@ class TestGemStreamUI < Gem::TestCase skip 'Always uses $stdin on windows' if Gem.win_platform? unless RUBY_VERSION > '1.9.2' - timeout(1) do + Timeout.timeout(1) do expected_answer = "Arthur, King of the Britons" @in.string = "#{expected_answer}\n" actual_answer = @sui.ask_for_password("What is your name?") @@ -76,7 +76,7 @@ class TestGemStreamUI < Gem::TestCase @in.tty = false - timeout(0.1) do + Timeout.timeout(0.1) do answer = @sui.ask_for_password("what is the airspeed velocity of an unladen swallow?") assert_equal nil, answer end @@ -88,7 +88,7 @@ class TestGemStreamUI < Gem::TestCase @in.tty = false - timeout(0.1) do + Timeout.timeout(0.1) do answer = @sui.ask_yes_no("do coconuts migrate?", false) assert_equal false, answer @@ -103,7 +103,7 @@ class TestGemStreamUI < Gem::TestCase @in.tty = false - timeout(0.1) do + Timeout.timeout(0.1) do assert_raises(Gem::OperationNotSupportedError) do @sui.ask_yes_no("do coconuts migrate?") end -- cgit v1.2.3