summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-09 05:06:44 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-09 05:06:44 +0000
commita4b5982b4c95b0c6779748bf010aa7445714f343 (patch)
treec5b858caaca30d621214278195b61b0f342190ff /test
parenta11aa75662f88ead04d340330c81bf243806ad57 (diff)
* test/xmlrpc: Test webrick error log is empty.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/xmlrpc/test_webrick_server.rb2
-rw-r--r--test/xmlrpc/webrick_testing.rb10
2 files changed, 7 insertions, 5 deletions
diff --git a/test/xmlrpc/test_webrick_server.rb b/test/xmlrpc/test_webrick_server.rb
index 052923db8b..0877ad2e6a 100644
--- a/test/xmlrpc/test_webrick_server.rb
+++ b/test/xmlrpc/test_webrick_server.rb
@@ -14,7 +14,7 @@ class Test_Webrick < Test::Unit::TestCase
@@basic_auth = WEBrick::HTTPAuth::BasicAuth.new(
:Realm => 'auth',
:UserDB => WEBrick::HTTPAuth::Htpasswd.new(File.expand_path('./htpasswd', File.dirname(__FILE__))),
- :Logger => Logger.new(File::NULL),
+ :Logger => NoLog,
)
def create_servlet
diff --git a/test/xmlrpc/webrick_testing.rb b/test/xmlrpc/webrick_testing.rb
index 464d61dc17..e2a0c3f133 100644
--- a/test/xmlrpc/webrick_testing.rb
+++ b/test/xmlrpc/webrick_testing.rb
@@ -2,10 +2,12 @@ require 'timeout'
module TestXMLRPC
module WEBrick_Testing
- class DummyLog < WEBrick::BasicLog
- def initialize() super(self) end
- def <<(*args) end
+ empty_log = Object.new
+ def empty_log.<<(str)
+ assert_equal('', str)
+ self
end
+ NoLog = WEBrick::Log.new(empty_log, WEBrick::BasicLog::WARN)
def start_server(config={})
raise "already started" if defined?(@__server) && @__server
@@ -14,7 +16,7 @@ module WEBrick_Testing
@__server = WEBrick::HTTPServer.new(
{
:BindAddress => "localhost",
- :Logger => DummyLog.new,
+ :Logger => NoLog,
:AccessLog => [],
}.update(config))
yield @__server