summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-04 06:16:06 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-04 06:16:06 +0000
commitd2e44245ff93f4ff3aa60c28834594022dea5906 (patch)
treef6fd9ee7ee30afd01599f1b32ba17a89be747a9d
parent2db32cd3857cdc52ad8a7ca8fed1196747bdcc7d (diff)
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
-rw-r--r--ChangeLog4
-rw-r--r--test/ruby/test_sleep.rb3
2 files changed, 7 insertions, 0 deletions
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 <mame@tsg.ne.jp>
+
+ * test/ruby/test_sleep.rb (test_sleep_5sec): stop gc.
+
Fri Jan 2 23:36:10 2009 Tanaka Akira <akr@fsij.org>
* 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