summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-20 13:41:00 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-20 13:41:00 +0000
commit9970a90c88d30c78ae0ff220a6c3ddcc446cdde1 (patch)
treead5749b045350957baea8c7c470d5ad435195677 /test
parent44900eec0ec9b52c7d9dbbcf0e5aaf01331faba5 (diff)
merge revision(s) 41468:
test_fiber.rb: longer timeout * test/ruby/test_fiber.rb (test_many_fibers): make timeout longer. 10sec is not sufficient. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_fiber.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index 38050386c4..411151ab76 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -46,7 +46,7 @@ class TestFiber < Test::Unit::TestCase
end
def test_many_fibers_with_threads
- assert_normal_exit %q{
+ assert_normal_exit <<-SRC, timeout: 60
max = 1000
@cnt = 0
(1..100).map{|ti|
@@ -60,7 +60,7 @@ class TestFiber < Test::Unit::TestCase
}.each{|t|
t.join
}
- }
+ SRC
end
def test_error