diff options
author | Evan Weaver <eweaver@twitter.com> | 2009-01-31 14:17:06 -0800 |
---|---|---|
committer | Evan Weaver <eweaver@twitter.com> | 2009-01-31 14:17:06 -0800 |
commit | cb3b9862a5fef4f3fd197e0319bbea0de562f9da (patch) | |
tree | 58dabd544368870fc98c814e0816b5c3bc361a8f /test/unit/test_ws.rb | |
parent | 3dd3bd73b8b9f520dbf35290a652d2fc0e423007 (diff) | |
download | unicorn-cb3b9862a5fef4f3fd197e0319bbea0de562f9da.tar.gz |
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
Diffstat (limited to 'test/unit/test_ws.rb')
-rw-r--r-- | test/unit/test_ws.rb | 7 |
1 files changed, 3 insertions, 4 deletions
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 = [ |