kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* test/webrick: Refine log tests.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-11-09 00:51:12 +00:00
parent f6695a95ea
commit 7044cea301
3 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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.

37
test/webrick/test_httpauth.rb
View file

@ -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\./
assert_match(pat, log); log.sub!(pat, '')
pat = /ERROR WEBrick::HTTPStatus::Unauthorized/
assert_match(pat, log); log.sub!(pat, '')
assert_not_match(/ERROR/, log)
log = log.lines.to_a
log.reject! {|line| /\A\s*\z/ =~ line }
pats = [
/ERROR Basic WEBrick's realm: webrick: password unmatch\./,
/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\./
assert_match(pat, log); log.sub!(pat, '')
pat = /ERROR WEBrick::HTTPStatus::Unauthorized/
assert_match(pat, log); log.sub!(pat, '')
pat = /ERROR Digest WEBrick's realm: webrick: digest unmatch\./
assert_match(pat, log); log.sub!(pat, '')
pat = /ERROR WEBrick::HTTPStatus::Unauthorized/
assert_match(pat, log); log.sub!(pat, '')
assert_not_match(/ERROR/, log)
log = log.lines.to_a
log.reject! {|line| /\A\s*\z/ =~ line }
pats = [
/ERROR Digest WEBrick's realm: no credentials in the request\./,
/ERROR WEBrick::HTTPStatus::Unauthorized/,
/ERROR Digest WEBrick's realm: webrick: digest unmatch\./
]
pats.each {|pat|
assert_operator(log, :grep, pat)
log.reject! {|line| pat =~ line }
}
assert_equal([], log)
end
private

2
test/webrick/utils.rb
View file

@ -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