diff options
author | Eric Wong <normalperson@yhbt.net> | 2009-02-05 00:50:52 -0800 |
---|---|---|
committer | Eric Wong <normalperson@yhbt.net> | 2009-02-09 19:50:37 -0800 |
commit | 2dddf957462f2cdbd6f141f35e0292a70b62c5a6 (patch) | |
tree | 2159a3233048cd84e7147572380f090ad22491a3 /test/unit/test_server.rb | |
parent | 28d571b7cca709641d964e00e6004facb6bfcc7e (diff) | |
download | unicorn-2dddf957462f2cdbd6f141f35e0292a70b62c5a6.tar.gz |
All tests for threading and semaphores have been removed. One test was changed because it depended on a shared variable. Tests will be replaced with tests to do process management instead.
Diffstat (limited to 'test/unit/test_server.rb')
-rw-r--r-- | test/unit/test_server.rb | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index f5043b8..df57989 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -9,10 +9,8 @@ require 'test/test_helper' include Unicorn class TestHandler - attr_reader :ran_test def call(env) - @ran_test = true # response.socket.write("HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\nhello!\n") [200, { 'Content-Type' => 'text/plain' }, ['hello!\n']] end @@ -27,8 +25,7 @@ class WebServerTest < Test::Unit::TestCase @tester = TestHandler.new @app = Rack::URLMap.new('/test' => @tester) redirect_test_io do - # We set max_queued_threads=1 so that we can test the reaping code - @server = HttpServer.new(@app, :Host => "127.0.0.1", :Port => @port, :Max_queued_threads => 1) + @server = HttpServer.new(@app, :Host => "127.0.0.1", :Port => @port) end @server.start end @@ -40,8 +37,8 @@ class WebServerTest < Test::Unit::TestCase end def test_simple_server - hit(["http://localhost:#{@port}/test"]) - assert @tester.ran_test, "Handler didn't really run" + results = hit(["http://localhost:#{@port}/test"]) + assert_equal 'hello!\n', results[0], "Handler didn't really run" end @@ -90,19 +87,6 @@ class WebServerTest < Test::Unit::TestCase end end - def test_max_queued_threads_overload - redirect_test_io do - assert_raises Errno::ECONNRESET, Errno::EPIPE, Errno::ECONNABORTED, Errno::EINVAL, IOError do - tests = [ - Thread.new { do_test(@valid_request, 1) }, - Thread.new { do_test(@valid_request, 10) }, - ] - - tests.each {|t| t.join} - end - end - end - def test_file_streamed_request body = "a" * (Unicorn::Const::MAX_BODY * 2) long = "GET /test HTTP/1.1\r\nContent-length: #{body.length}\r\n\r\n" + body |