1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
ruby--ruby/test/ruby/test_readpartial.rb
normal 9bb7dfa247 normalize reference to Timeout::Error
From: John Bachir <j@jjb.cc>

* bootstraptest/test_io.rb (assert_finish):
  normalize rescue for Timeout::Error
* lib/net/ftp.rb (Net#read_timeout): ditto for doc
* lib/resolv.rb (Resolv::ResolvTimeout): ditto for subclass
* lib/webrick/httprequest.rb (_read_data): ditto for rescue
* sample/timeout.rb (p timeout): ditto for call
* test/drb/drbtest.rb (test_06_timeout): ditto
* test/ruby/test_readpartial.rb (test_open_pipe): ditto
* test/thread/test_queue.rb (test_queue_thread_raise): ditto
* thread.c (rb_thread_s_handle_interrupt): ditto for doc
  [ruby-core:65481] [misc #10339]

TimeoutError is a legacy constant, Timeout::Error is the canonical constant.
This patch normalizes all code and comments to reference Timeout::Error.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-07 20:00:09 +00:00

72 lines
1.5 KiB
Ruby

require 'test/unit'
require 'timeout'
require 'fcntl'
class TestReadPartial < Test::Unit::TestCase
def make_pipe
r, w = IO.pipe
r.binmode
w.binmode
begin
yield r, w
ensure
r.close unless r.closed?
w.close unless w.closed?
end
end
def pipe
make_pipe {|r, w|
yield r, w
}
return unless defined?(Fcntl::F_SETFL)
return unless defined?(Fcntl::F_GETFL)
return unless defined?(Fcntl::O_NONBLOCK)
make_pipe {|r, w|
r.fcntl(Fcntl::F_SETFL, r.fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
yield r, w
}
end
def test_length_zero
pipe {|r, w|
assert_equal('', r.readpartial(0))
}
end
def test_closed_pipe
pipe {|r, w|
w << 'abc'
w.close
assert_equal('ab', r.readpartial(2))
assert_equal('c', r.readpartial(2))
assert_raise(EOFError) { r.readpartial(2) }
assert_raise(EOFError) { r.readpartial(2) }
}
end
def test_open_pipe
pipe {|r, w|
w << 'abc'
assert_equal('ab', r.readpartial(2))
assert_equal('c', r.readpartial(2))
assert_raise(Timeout::Error) {
timeout(0.1) { r.readpartial(2) }
}
}
end
def test_with_stdio
pipe {|r, w|
w << "abc\ndef\n"
assert_equal("abc\n", r.gets)
w << "ghi\n"
assert_equal("de", r.readpartial(2))
assert_equal("f\n", r.readpartial(4096))
assert_equal("ghi\n", r.readpartial(4096))
assert_raise(Timeout::Error) {
timeout(0.1) { r.readpartial(2) }
}
}
end
end