From a4b5982b4c95b0c6779748bf010aa7445714f343 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 9 Nov 2014 05:06:44 +0000
Subject: [PATCH] * 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
---
 ChangeLog                          |  4 ++++
 test/xmlrpc/test_webrick_server.rb |  2 +-
 test/xmlrpc/webrick_testing.rb     | 10 ++++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index da37329bc1..a305182229 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Nov  9 14:06:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc: Test webrick error log is empty.
+
 Sun Nov  9 13:47:02 2014  Koichi Sasada  <ko1@atdot.net>
 
 	* gc.c (is_incremental_marking): use #if/#else because
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