diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 11:48:35 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-29 11:48:35 +0000 |
commit | 224471fd572c1818e99c66f756ce398745885398 (patch) | |
tree | 8f02ccee39290f8aa03b81c401d801ba4ac0d601 /test/webrick/test_httpauth.rb | |
parent | 3056933cc0b7c1d68ddda1a143bfa298a92f4a0c (diff) | |
download | ruby-224471fd572c1818e99c66f756ce398745885398.tar.gz |
* test/webrick/utils.rb (start_server): provide a reference to log of
webrick.
* test/webrick/test_httpproxy.rb, test/webrick/test_httpauth.rb,
test/webrick/test_cgi.rb, test/webrick/test_httpserver.rb,
test/webrick/test_server.rb, test/webrick/test_filehandler.rb: use
webrick log as an assertion message.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/webrick/test_httpauth.rb')
-rw-r--r-- | test/webrick/test_httpauth.rb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/webrick/test_httpauth.rb b/test/webrick/test_httpauth.rb index 427f839f35..a6e29474b3 100644 --- a/test/webrick/test_httpauth.rb +++ b/test/webrick/test_httpauth.rb @@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), "utils.rb") class TestWEBrickHTTPAuth < Test::Unit::TestCase def test_basic_auth - TestWEBrick.start_httpserver{|server, addr, port| + TestWEBrick.start_httpserver{|server, addr, port, log| realm = "WEBrick's realm" path = "/basic_auth" @@ -20,14 +20,14 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase http = Net::HTTP.new(addr, port) g = Net::HTTP::Get.new(path) g.basic_auth("webrick", "supersecretpassword") - http.request(g){|res| assert_equal("hoge", res.body)} + http.request(g){|res| assert_equal("hoge", res.body, log.call)} g.basic_auth("webrick", "not super") - http.request(g){|res| assert_not_equal("hoge", res.body)} + http.request(g){|res| assert_not_equal("hoge", res.body, log.call)} } end def test_basic_auth2 - TestWEBrick.start_httpserver{|server, addr, port| + TestWEBrick.start_httpserver{|server, addr, port, log| realm = "WEBrick's realm" path = "/basic_auth2" @@ -41,9 +41,9 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase htpasswd = WEBrick::HTTPAuth::Htpasswd.new(tmpfile.path) users = [] htpasswd.each{|user, pass| users << user } - assert_equal(2, users.size) - assert(users.member?("webrick")) - assert(users.member?("foo")) + assert_equal(2, users.size, log.call) + assert(users.member?("webrick"), log.call) + assert(users.member?("foo"), log.call) server.mount_proc(path){|req, res| auth = WEBrick::HTTPAuth::BasicAuth.new( @@ -56,9 +56,9 @@ class TestWEBrickHTTPAuth < Test::Unit::TestCase http = Net::HTTP.new(addr, port) g = Net::HTTP::Get.new(path) g.basic_auth("webrick", "supersecretpassword") - http.request(g){|res| assert_equal("hoge", res.body)} + http.request(g){|res| assert_equal("hoge", res.body, log.call)} g.basic_auth("webrick", "not super") - http.request(g){|res| assert_not_equal("hoge", res.body)} + http.request(g){|res| assert_not_equal("hoge", res.body, log.call)} } end |