From cb3b9862a5fef4f3fd197e0319bbea0de562f9da Mon Sep 17 00:00:00 2001 From: Evan Weaver Date: Sat, 31 Jan 2009 14:17:06 -0800 Subject: Merge pivotal code. Breaks world. Added option to throttle number of concurrent threads processing requests. Conflicts: bin/mongrel_rails lib/mongrel.rb lib/mongrel/configurator.rb lib/mongrel/rails.rb test/unit/test_ws.rb --- test/unit/test_ws.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'test/unit/test_ws.rb') diff --git a/test/unit/test_ws.rb b/test/unit/test_ws.rb index 7508c7f..2510c3a 100644 --- a/test/unit/test_ws.rb +++ b/test/unit/test_ws.rb @@ -27,9 +27,8 @@ class WebServerTest < Test::Unit::TestCase @tester = TestHandler.new @app = Rack::URLMap.new('/test' => @tester) redirect_test_io do - # We set num_processors=1 so that we can test the reaping code - @server = HttpServer.new("127.0.0.1", @port, @app, :num_processors => 1) - @server.start! + # We set max_queued_threads=1 so that we can test the reaping code + @server = HttpServer.new("127.0.0.1", @port, @app, :max_queued_threads => 1) end end @@ -90,7 +89,7 @@ class WebServerTest < Test::Unit::TestCase end end - def test_num_processors_overload + def test_max_queued_threads_overload redirect_test_io do assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL, IOError do tests = [ -- cgit v1.2.3-24-ge0c7