summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-14 08:40:17 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-14 08:40:17 +0000
commit69b587334f05e8b7526a1b7271e9483cf033d12f (patch)
tree62d23b19c84fd29a18abc036dfe7229ba95f74ce
parent96fba4293d334cfea3caa5639858dce5c2b7eb61 (diff)
downloadruby-69b587334f05e8b7526a1b7271e9483cf033d12f.tar.gz
ruby-69b587334f05e8b7526a1b7271e9483cf033d12f.tar.xz
ruby-69b587334f05e8b7526a1b7271e9483cf033d12f.zip
* test/ruby/test_time.rb (TestTime#test_time_interval): add timeout
to avoid stopping tests. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_time.rb7
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bae63efa8..5a01454e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 14 17:37:01 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/ruby/test_time.rb (TestTime#test_time_interval): add timeout
+ to avoid stopping tests.
+
Mon Jul 14 15:18:30 2008 NARUSE, Yui <naruse@ruby-lang.org>
* transcode.c (get_replacement_character): temporary function,
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index c0620323f..fe62f6a5b 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -1,5 +1,6 @@
require 'test/unit'
require 'rational'
+require 'timeout'
class TestTime < Test::Unit::TestCase
def test_time_add()
@@ -217,7 +218,11 @@ class TestTime < Test::Unit::TestCase
def test_time_interval
m = Mutex.new.lock
- assert_nothing_raised { m.sleep(0) }
+ assert_nothing_raised {
+ Timeout.timeout(10) {
+ m.sleep(0)
+ }
+ }
assert_raise(ArgumentError) { m.sleep(-1) }
end