1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/open-uri/test_open-uri.rb: Don't ignore webrick's log.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-11-05 14:29:46 +00:00
parent d1ad4934f5
commit f4c848e158
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Nov 5 23:24:45 2014 Tanaka Akira <akr@fsij.org>
* test/open-uri/test_open-uri.rb: Don't ignore webrick's log.
Wed Nov 5 19:20:08 2014 Tanaka Akira <akr@fsij.org> Wed Nov 5 19:20:08 2014 Tanaka Akira <akr@fsij.org>
* lib/webrick/server.rb: Stop lisntner loop properly. * lib/webrick/server.rb: Stop lisntner loop properly.

21
test/open-uri/test_open-uri.rb
View File

@ -13,19 +13,26 @@ class TestOpenURI < Test::Unit::TestCase
def NullLog.<<(arg) def NullLog.<<(arg)
end end
def with_http def with_http(capture_log=false)
if capture_log
log = StringIO.new('')
logger = WEBrick::Log.new(log, WEBrick::BasicLog::WARN)
else
log = nil
logger = WEBrick::Log.new($stdout, WEBrick::BasicLog::WARN)
end
Dir.mktmpdir {|dr| Dir.mktmpdir {|dr|
srv = WEBrick::HTTPServer.new({ srv = WEBrick::HTTPServer.new({
:DocumentRoot => dr, :DocumentRoot => dr,
:ServerType => Thread, :ServerType => Thread,
:Logger => WEBrick::Log.new(NullLog), :Logger => logger,
:AccessLog => [[NullLog, ""]], :AccessLog => [[NullLog, ""]],
:BindAddress => '127.0.0.1', :BindAddress => '127.0.0.1',
:Port => 0}) :Port => 0})
_, port, _, host = srv.listeners[0].addr _, port, _, host = srv.listeners[0].addr
begin begin
th = srv.start th = srv.start
yield srv, dr, "http://#{host}:#{port}" yield srv, dr, "http://#{host}:#{port}", log
ensure ensure
srv.shutdown srv.shutdown
th.join th.join
@ -76,9 +83,10 @@ class TestOpenURI < Test::Unit::TestCase
end end
def test_404 def test_404
with_http {|srv, dr, url| with_http(true) {|srv, dr, url, log|
exc = assert_raise(OpenURI::HTTPError) { open("#{url}/not-exist") {} } exc = assert_raise(OpenURI::HTTPError) { open("#{url}/not-exist") {} }
assert_equal("404", exc.io.status[0]) assert_equal("404", exc.io.status[0])
assert_match(%r{ERROR `/not-exist' not found}, log.string)
} }
end end
@ -400,7 +408,7 @@ class TestOpenURI < Test::Unit::TestCase
end end
def test_redirect_auth def test_redirect_auth
with_http {|srv, dr, url| with_http(true) {|srv, dr, url, log|
srv.mount_proc("/r1/") {|req, res| res.status = 301; res["location"] = "#{url}/r2" } srv.mount_proc("/r1/") {|req, res| res.status = 301; res["location"] = "#{url}/r2" }
srv.mount_proc("/r2/") {|req, res| srv.mount_proc("/r2/") {|req, res|
if req["Authorization"] != "Basic #{['user:pass'].pack('m').chomp}" if req["Authorization"] != "Basic #{['user:pass'].pack('m').chomp}"
@ -410,11 +418,14 @@ class TestOpenURI < Test::Unit::TestCase
} }
exc = assert_raise(OpenURI::HTTPError) { open("#{url}/r2/") {} } exc = assert_raise(OpenURI::HTTPError) { open("#{url}/r2/") {} }
assert_equal("401", exc.io.status[0]) assert_equal("401", exc.io.status[0])
assert_match(/ERROR WEBrick::HTTPStatus::Unauthorized/, log.string)
log.rewind; log.truncate(0)
open("#{url}/r2/", :http_basic_authentication=>['user', 'pass']) {|f| open("#{url}/r2/", :http_basic_authentication=>['user', 'pass']) {|f|
assert_equal("r2", f.read) assert_equal("r2", f.read)
} }
exc = assert_raise(OpenURI::HTTPError) { open("#{url}/r1/", :http_basic_authentication=>['user', 'pass']) {} } exc = assert_raise(OpenURI::HTTPError) { open("#{url}/r1/", :http_basic_authentication=>['user', 'pass']) {} }
assert_equal("401", exc.io.status[0]) assert_equal("401", exc.io.status[0])
assert_match(/ERROR WEBrick::HTTPStatus::Unauthorized/, log.string)
} }
end end