diff options
Diffstat (limited to 'test/webrick/utils.rb')
-rw-r--r-- | test/webrick/utils.rb | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/test/webrick/utils.rb b/test/webrick/utils.rb index b15ef9a408..e1c2344fb1 100644 --- a/test/webrick/utils.rb +++ b/test/webrick/utils.rb @@ -32,17 +32,13 @@ module TestWEBrick module_function def start_server(klass, config={}, &block) - log_string = "" - logger = Object.new - logger.instance_eval do - define_singleton_method(:<<) {|msg| log_string << msg } - end - log = proc { "webrick log start:\n" + log_string.gsub(/^/, " ").chomp + "\nwebrick log end" } + log_ary = [] + log = proc { "webrick log start:\n" + log_ary.join.gsub(/^/, " ").chomp + "\nwebrick log end" } server = klass.new({ :BindAddress => "127.0.0.1", :Port => 0, :ServerType => Thread, - :Logger => WEBrick::Log.new(logger, WEBrick::BasicLog::WARN), - :AccessLog => [[logger, ""]] + :Logger => WEBrick::Log.new(log_ary, WEBrick::BasicLog::WARN), + :AccessLog => [[log_ary, ""]] }.update(config)) server_thread = server.start addr = server.listeners[0].addr @@ -54,7 +50,7 @@ module TestWEBrick end } assert_join_threads([client_thread, server_thread]) - log_string + log_ary end def start_httpserver(config={}, &block) |