* test/webrick: Refine log tests.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,7 @@
+Sun Nov  9 09:50:22 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/webrick: Refine log tests.
+
 Sun Nov  9 08:58:05 2014  Tanaka Akira  <akr@fsij.org>
 
 	* defs/known_errors.def (EHWPOISON): New errno symbol.

test/webrick/test_httpauth.rb

@@ -61,11 +61,17 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase
         http.request(g){|res| assert_not_equal("hoge", res.body, log.call)}
       }
     }
-    pat = /ERROR Basic WEBrick's realm: webrick: password unmatch\./
+    log = log.lines.to_a
-    assert_match(pat, log); log.sub!(pat, '')
+    log.reject! {|line| /\A\s*\z/ =~ line }
-    pat = /ERROR WEBrick::HTTPStatus::Unauthorized/
+    pats = [
-    assert_match(pat, log); log.sub!(pat, '')
+      /ERROR Basic WEBrick's realm: webrick: password unmatch\./,
-    assert_not_match(/ERROR/, log)
+      /ERROR WEBrick::HTTPStatus::Unauthorized/
+    ]
+    pats.each {|pat|
+      assert_operator(log, :grep, pat)
+      log.reject! {|line| pat =~ line }
+    }
+    assert_equal([], log)
   end
 
   def test_basic_auth3
@@ -148,15 +154,18 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase
         end
       }
     }
-    pat = /ERROR Digest WEBrick's realm: no credentials in the request\./
+    log = log.lines.to_a
-    assert_match(pat, log); log.sub!(pat, '')
+    log.reject! {|line| /\A\s*\z/ =~ line }
-    pat = /ERROR WEBrick::HTTPStatus::Unauthorized/
+    pats = [
-    assert_match(pat, log); log.sub!(pat, '')
+      /ERROR Digest WEBrick's realm: no credentials in the request\./,
-    pat = /ERROR Digest WEBrick's realm: webrick: digest unmatch\./
+      /ERROR WEBrick::HTTPStatus::Unauthorized/,
-    assert_match(pat, log); log.sub!(pat, '')
+      /ERROR Digest WEBrick's realm: webrick: digest unmatch\./
-    pat = /ERROR WEBrick::HTTPStatus::Unauthorized/
+    ]
-    assert_match(pat, log); log.sub!(pat, '')
+    pats.each {|pat|
-    assert_not_match(/ERROR/, log)
+      assert_operator(log, :grep, pat)
+      log.reject! {|line| pat =~ line }
+    }
+    assert_equal([], log)
   end
 
   private

test/webrick/utils.rb

@@ -41,7 +41,7 @@ module TestWEBrick
     server = klass.new({
       :BindAddress => "127.0.0.1", :Port => 0,
       :ServerType => Thread,
-      :Logger => WEBrick::Log.new(logger),
+      :Logger => WEBrick::Log.new(logger, WEBrick::BasicLog::WARN),
       :AccessLog => [[logger, ""]]
     }.update(config))
     server_thread = server.start