From 57fd3577619eceb62d8a57cc7cc43025990a6c0c Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 23 Dec 2014 18:14:15 +0000 Subject: [PATCH] merge revision(s) 48900,48902: [Backport #10618] test/test_weakref.rb: increase timeout [Bug #10618] * test/test_weakref.rb (test_repeated_object_leak): increase timeout [Bug #10618] * test/test_weakref.rb (test_repeated_object_leak): increase timeout [Bug #10618] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@48949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/test_weakref.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 07ff397a92..1968c3ebe8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 24 03:12:28 2014 Eric Wong + + * test/test_weakref.rb (test_repeated_object_leak): increase timeout + [Bug #10618] + Wed Dec 24 02:22:11 2014 Tanaka Akira * lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1. diff --git a/test/test_weakref.rb b/test/test_weakref.rb index 36b5d5bc51..d21b431abb 100644 --- a/test/test_weakref.rb +++ b/test/test_weakref.rb @@ -63,7 +63,7 @@ class TestWeakRef < Test::Unit::TestCase def test_repeated_object_leak bug10537 = '[ruby-core:66428]' - assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537) + assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537, timeout: 60) a = Object.new 150_000.times { WeakRef.new(a) } end;