diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-16 06:57:47 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-16 06:57:47 +0000 |
| commit | 836271c28be00a3ef8bc60762369ce99da0169e5 (patch) | |
| tree | 3c4ce80704abac09a0ebaf5b53927e92f5adedee /test | |
| parent | a0efdbbb6b35efb2581e3a7dcdef3abca2dcd3dd (diff) | |
merge revision(s) 26344,27367:
* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
use inclusive range same as the header representation.
* test/webrick/utils.rb (TestWEBrick#start_server): add log for
test_filehandler.rb
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/webrick/test_filehandler.rb | 2 | ||||
| -rw-r--r-- | test/webrick/utils.rb | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb index b312c2a03f..63c12c7baa 100644 --- a/test/webrick/test_filehandler.rb +++ b/test/webrick/test_filehandler.rb @@ -76,7 +76,7 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase range = nil bug2593 = '[ruby-dev:40030]' - TestWEBrick.start_httpserver(config) do |server, addr, port| + TestWEBrick.start_httpserver(config) do |server, addr, port, log| http = Net::HTTP.new(addr, port) req = Net::HTTP::Get.new("/") http.request(req){|res| diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb index 5db94e6cd5..29d5b23ba4 100644 --- a/test/webrick/utils.rb +++ b/test/webrick/utils.rb @@ -27,15 +27,21 @@ module TestWEBrick module_function def start_server(klass, config={}, &block) + log_string = "" + logger = Object.new + class << logger; self; end.class_eval do + define_method(:<<) {|msg| log_string << msg } + end + log = proc { "webrick log start:\n" + log_string.gsub(/^/, " ").chomp + "\nwebrick log end" } server = klass.new({ :BindAddress => "127.0.0.1", :Port => 0, - :Logger => WEBrick::Log.new(NullWriter), + :Logger => WEBrick::Log.new(logger), :AccessLog => [[NullWriter, ""]] }.update(config)) begin thread = Thread.start{ server.start } addr = server.listeners[0].addr - block.call([server, addr[3], addr[1]]) + block.call([server, addr[3], addr[1], log]) ensure server.stop thread.join |