ruby-changes:15468
From: nobu <ko1@a...>
Date: Sat, 17 Apr 2010 07:04:25 +0900 (JST)
Subject: [ruby-changes:15468] Ruby:r27367 (ruby_1_8): * test/webrick/utils.rb (TestWEBrick#start_server): add log for
nobu 2010-04-17 07:01:33 +0900 (Sat, 17 Apr 2010) New Revision: 27367 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27367 Log: * test/webrick/utils.rb (TestWEBrick#start_server): add log for test_filehandler.rb Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/test/webrick/test_filehandler.rb branches/ruby_1_8/test/webrick/utils.rb Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 27366) +++ ruby_1_8/ChangeLog (revision 27367) @@ -1,3 +1,8 @@ +Sat Apr 17 07:01:31 2010 Nobuyoshi Nakada <nobu@r...> + + * test/webrick/utils.rb (TestWEBrick#start_server): add log for + test_filehandler.rb + Wed Apr 14 17:53:44 2010 Nobuyoshi Nakada <nobu@r...> * io.c (appendline): should terminate. Index: ruby_1_8/test/webrick/utils.rb =================================================================== --- ruby_1_8/test/webrick/utils.rb (revision 27366) +++ ruby_1_8/test/webrick/utils.rb (revision 27367) @@ -27,15 +27,21 @@ 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 Index: ruby_1_8/test/webrick/test_filehandler.rb =================================================================== --- ruby_1_8/test/webrick/test_filehandler.rb (revision 27366) +++ ruby_1_8/test/webrick/test_filehandler.rb (revision 27367) @@ -76,7 +76,7 @@ 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| -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/