[ruby/timeout] refactor the change to raise for nil and type-errror and added tests

ruby/timeout@ffc8d7c003

Author: Cosmicoppai

lib/timeout.rb

@@ -164,8 +164,8 @@ def self.ensure_timeout_thread_created
   # Timeout</tt> into your classes so they have a #timeout method, as well as
   # a module method, so you can call it directly as Timeout.timeout().
   def timeout(sec, klass = nil, message = nil, &block)   #:yield: +sec+
-    raise ArgumentError, "Timeout sec must be a positive number" if sec.is_a?(Numeric) && sec < 0
-    return yield(sec) if sec == nil or sec.zero?
+    raise ArgumentError, "Timeout sec must be a positive number" unless sec.is_a?(Numeric) && sec >= 0
+    return yield(sec) if sec.zero?
 
     message ||= "execution expired"
 

test/test_timeout.rb

@@ -26,7 +26,7 @@ def test_allows_zero_seconds
   end
 
   def test_allows_nil_seconds
-    assert_nothing_raised do
+    assert_raise(ArgumentError) do
       assert_equal :ok, Timeout.timeout(nil){:ok}
     end
   end
@@ -120,7 +120,7 @@ def test_nested_timeout_which_error_bubbles_up
   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 }}
+    assert_raise(ArgumentError, bug3168) {Timeout.timeout(n) { sleep 0.1 }}
   end
 
   def test_skip_rescue_standarderror