diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-08 15:38:33 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-08 15:38:33 +0000 |
commit | 742bbbb01b310440a7672fabddd016226d20bee7 (patch) | |
tree | 735522e7c5325517e91b5bbb3932d1596a4ec2b7 /test/webrick/test_httpserver.rb | |
parent | 8222432c9db1432995538a5d355d014c6fd1a0e9 (diff) | |
download | ruby-742bbbb01b310440a7672fabddd016226d20bee7.tar.gz |
* test/webrick: Examine log and use assert_join_threads.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/webrick/test_httpserver.rb')
-rw-r--r-- | test/webrick/test_httpserver.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/webrick/test_httpserver.rb b/test/webrick/test_httpserver.rb index 3e19a56d8f..70ad302549 100644 --- a/test/webrick/test_httpserver.rb +++ b/test/webrick/test_httpserver.rb @@ -4,9 +4,16 @@ require "webrick" require_relative "utils" class TestWEBrickHTTPServer < Test::Unit::TestCase + empty_log = Object.new + def empty_log.<<(str) + assert_equal('', str) + self + end + NoLog = WEBrick::Log.new(empty_log, WEBrick::BasicLog::WARN) + def test_mount httpd = WEBrick::HTTPServer.new( - :Logger => WEBrick::Log.new(TestWEBrick::NullWriter), + :Logger => NoLog, :DoNotListen=>true ) httpd.mount("/", :Root) @@ -75,7 +82,7 @@ class TestWEBrickHTTPServer < Test::Unit::TestCase def httpd(addr, port, host, ali) config ={ - :Logger => WEBrick::Log.new(TestWEBrick::NullWriter), + :Logger => NoLog, :DoNotListen => true, :BindAddress => addr, :Port => port, @@ -229,7 +236,7 @@ class TestWEBrickHTTPServer < Test::Unit::TestCase :BindAddress => addr, :Port => port, :DoNotListen => true, - :Logger => WEBrick::Log.new(TestWEBrick::NullWriter), + :Logger => NoLog, :AccessLog => [], :RequestCallback => Proc.new{|req, res| requested1 += 1 }, } |