From 70a385a4f655465e6f65c07a91150c61b34aea2e Mon Sep 17 00:00:00 2001 From: k0kubun Date: Tue, 4 Dec 2018 11:45:05 +0000 Subject: Re-commit r65722 which was accidentally reverted by r65904 158562dabb197d6efc53cabe6662177c6ec3f43e git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/rubygems/test_gem_stream_ui.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/rubygems/test_gem_stream_ui.rb b/test/rubygems/test_gem_stream_ui.rb index 5735bbc9a9..342b7071a6 100644 --- a/test/rubygems/test_gem_stream_ui.rb +++ b/test/rubygems/test_gem_stream_ui.rb @@ -4,6 +4,7 @@ require 'rubygems/user_interaction' require 'timeout' class TestGemStreamUI < Gem::TestCase + SHORT_TIMEOUT = (defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?) ? 1.0 : 0.1 # increase timeout with MJIT for --jit-wait testing module IsTty attr_accessor :tty @@ -47,7 +48,7 @@ class TestGemStreamUI < Gem::TestCase def test_ask_no_tty @in.tty = false - Timeout.timeout(0.1) do + Timeout.timeout(SHORT_TIMEOUT) do answer = @sui.ask("what is your favorite color?") assert_nil answer end @@ -65,7 +66,7 @@ class TestGemStreamUI < Gem::TestCase def test_ask_for_password_no_tty @in.tty = false - Timeout.timeout(0.1) do + Timeout.timeout(SHORT_TIMEOUT) do answer = @sui.ask_for_password("what is the airspeed velocity of an unladen swallow?") assert_nil answer end @@ -74,7 +75,7 @@ class TestGemStreamUI < Gem::TestCase def test_ask_yes_no_no_tty_with_default @in.tty = false - Timeout.timeout(0.1) do + Timeout.timeout(SHORT_TIMEOUT) do answer = @sui.ask_yes_no("do coconuts migrate?", false) assert_equal false, answer @@ -86,7 +87,7 @@ class TestGemStreamUI < Gem::TestCase def test_ask_yes_no_no_tty_without_default @in.tty = false - Timeout.timeout(0.1) do + Timeout.timeout(SHORT_TIMEOUT) do assert_raises(Gem::OperationNotSupportedError) do @sui.ask_yes_no("do coconuts migrate?") end -- cgit v1.2.3