From d2e44245ff93f4ff3aa60c28834594022dea5906 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 4 Jan 2009 06:16:06 +0000 Subject: [PATCH] merges r21279 from trunk into ruby_1_9_1. * test/ruby/test_sleep.rb (test_sleep_5sec): stop gc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ test/ruby/test_sleep.rb | 3 +++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index c769180f23..917fae75f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jan 2 23:51:41 2009 Yusuke Endoh + + * test/ruby/test_sleep.rb (test_sleep_5sec): stop gc. + Fri Jan 2 23:36:10 2009 Tanaka Akira * ext/socket/socket.c: don't apply socktype hack [ruby-core:184] for diff --git a/test/ruby/test_sleep.rb b/test/ruby/test_sleep.rb index 675fdc9747..adc4876216 100644 --- a/test/ruby/test_sleep.rb +++ b/test/ruby/test_sleep.rb @@ -2,9 +2,12 @@ require 'test/unit' class TestSleep < Test::Unit::TestCase def test_sleep_5sec + GC.disable start = Time.now sleep 5 slept = Time.now-start assert_in_delta(5.0, slept, 0.1, "[ruby-core:18015]: longer than expected") + ensure + GC.enable end end