nobu	2010-04-19 18:58:09 +0900 (Mon, 19 Apr 2010)

  New Revision: 27397

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27397

  Log:
    * lib/timeout.rb (Timeout#timeout): propagate errors to the
      caller.  [ruby-dev:41010]'

  Modified files:
    branches/ruby_1_8/test/test_timeout.rb
    trunk/test/test_timeout.rb

Index: test/test_timeout.rb
===================================================================
--- test/test_timeout.rb	(revision 27396)
+++ test/test_timeout.rb	(revision 27397)
@@ -23,4 +23,10 @@
     end
     assert !@flag, "[ruby-dev:38319]"
   end
+
+  def test_cannot_convert_into_time_interval
+    bug3168 = '[ruby-dev:41010]'
+    def (n = Object.new).zero?; false; end
+    assert_raise(TypeError, bug3168) {Timeout.timeout(n) { sleep 0.1 }}
+  end
 end
Index: ruby_1_8/test/test_timeout.rb
===================================================================
--- ruby_1_8/test/test_timeout.rb	(revision 27396)
+++ ruby_1_8/test/test_timeout.rb	(revision 27397)
@@ -23,4 +23,10 @@
     end
     assert !@flag, "[ruby-dev:38319]"
   end
+
+  def test_cannot_convert_into_time_interval
+    bug3168 = '[ruby-dev:41010]'
+    def (n = Object.new).zero?; false; end
+    assert_raise(TypeError, bug3168) {Timeout.timeout(n) { sleep 0.1 }}
+  end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/