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
This commit is contained in:
naruse 2014-12-23 18:14:15 +00:00
parent 7f5bc1bae5
commit 57fd357761
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,8 @@
Wed Dec 24 03:12:28 2014 Eric Wong <e@80x24.org>
* test/test_weakref.rb (test_repeated_object_leak): increase timeout
[Bug #10618]
Wed Dec 24 02:22:11 2014 Tanaka Akira <akr@fsij.org> Wed Dec 24 02:22:11 2014 Tanaka Akira <akr@fsij.org>
* lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1. * lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1.

View file

@ -63,7 +63,7 @@ class TestWeakRef < Test::Unit::TestCase
def test_repeated_object_leak def test_repeated_object_leak
bug10537 = '[ruby-core:66428]' 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 a = Object.new
150_000.times { WeakRef.new(a) } 150_000.times { WeakRef.new(a) }
end; end;