diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-14 15:45:42 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-14 15:45:42 +0000 |
commit | 108d1632e1ae83790692293047c3333220c1c9fd (patch) | |
tree | f18c7f46dd5d4f92a696cb1bb0b6724213e37df6 /test | |
parent | 844f78f5564aeadb846cd7c8eec8e1dd507f7f60 (diff) |
merge revision(s) 39967: [Backport #8193]
* time.c (num_exact): use to_r method only if to_int method is
available.
[ruby-core:53764] [Bug #8173] reported by Hiro Asari.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/ruby/test_time.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index 15b6ae5bef..22df27067f 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -351,6 +351,7 @@ class TestTime < Test::Unit::TestCase end assert_raise(ArgumentError) { Time.gm(2000, 1, 1, 0, 0, -(2**31), :foo, :foo) } o = Object.new + def o.to_int; 0; end def o.to_r; nil; end assert_raise(TypeError) { Time.gm(2000, 1, 1, 0, 0, o, :foo, :foo) } def o.to_r; ""; end |