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 | a44a7de55bb1baf38a2fa793421f61c338fd0917 (patch) | |
| tree | 793ec3f9897d9b1df003221783b7f3125a6570c7 /test/webrick/test_server.rb | |
| parent | 47844862c869a02046d8f2736ddf062b80bfce91 (diff) | |
| download | ruby-a44a7de55bb1baf38a2fa793421f61c338fd0917.tar.gz ruby-a44a7de55bb1baf38a2fa793421f61c338fd0917.tar.xz ruby-a44a7de55bb1baf38a2fa793421f61c338fd0917.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/webrick/test_server.rb')
| -rw-r--r-- | test/webrick/test_server.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/test/webrick/test_server.rb b/test/webrick/test_server.rb index ce5ee85c6..4c064fdb4 100644 --- a/test/webrick/test_server.rb +++ b/test/webrick/test_server.rb @@ -13,12 +13,12 @@ class TestWEBrickServer < Test::Unit::TestCase end def test_server - TestWEBrick.start_server(Echo){|server, addr, port| + TestWEBrick.start_server(Echo){|server, addr, port, log| TCPSocket.open(addr, port){|sock| - sock.puts("foo"); assert_equal("foo\n", sock.gets) - sock.puts("bar"); assert_equal("bar\n", sock.gets) - sock.puts("baz"); assert_equal("baz\n", sock.gets) - sock.puts("qux"); assert_equal("qux\n", sock.gets) + sock.puts("foo"); assert_equal("foo\n", sock.gets, log.call) + sock.puts("bar"); assert_equal("bar\n", sock.gets, log.call) + sock.puts("baz"); assert_equal("baz\n", sock.gets, log.call) + sock.puts("qux"); assert_equal("qux\n", sock.gets, log.call) } } end @@ -30,15 +30,15 @@ class TestWEBrickServer < Test::Unit::TestCase :StartCallback => Proc.new{ started += 1 }, :StopCallback => Proc.new{ stopped += 1 }, } - TestWEBrick.start_server(Echo, config){|server, addr, port| + TestWEBrick.start_server(Echo, config){|server, addr, port, log| true while server.status != :Running - assert_equal(started, 1) - assert_equal(stopped, 0) - assert_equal(accepted, 0) + assert_equal(started, 1, log.call) + assert_equal(stopped, 0, log.call) + assert_equal(accepted, 0, log.call) TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets } TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets } TCPSocket.open(addr, port){|sock| (sock << "foo\n").gets } - assert_equal(accepted, 3) + assert_equal(accepted, 3, log.call) } assert_equal(started, 1) assert_equal(stopped, 1) |