From 9e7a8114fb0fcc56b475d17f158eaa5b7f1f7bdd Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 2 Feb 2011 17:37:22 -0800 Subject: Fix Ruby 1.9.3dev warnings for i in `git ls-files '*.rb'`; do ruby -w -c $i; done --- test/unit/test_request.rb | 6 +++--- test/unit/test_server.rb | 11 ++++------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'test/unit') diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb index 67ac1b9..bd452a5 100644 --- a/test/unit/test_request.rb +++ b/test/unit/test_request.rb @@ -121,7 +121,7 @@ class RequestTest < Test::Unit::TestCase def test_no_content_stringio client = MockRequest.new("GET / HTTP/1.1\r\nHost: foo\r\n\r\n") - res = env = nil + env = nil assert_nothing_raised { env = @request.read(client) } assert_equal StringIO, env['rack.input'].class end @@ -130,7 +130,7 @@ class RequestTest < Test::Unit::TestCase client = MockRequest.new("PUT / HTTP/1.1\r\n" \ "Content-Length: 0\r\n" \ "Host: foo\r\n\r\n") - res = env = nil + env = nil assert_nothing_raised { env = @request.read(client) } assert_equal StringIO, env['rack.input'].class end @@ -139,7 +139,7 @@ class RequestTest < Test::Unit::TestCase client = MockRequest.new("PUT / HTTP/1.1\r\n" \ "Content-Length: 1\r\n" \ "Host: foo\r\n\r\n") - res = env = nil + env = nil assert_nothing_raised { env = @request.read(client) } assert_equal Unicorn::TeeInput, env['rack.input'].class end diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index 41d3e02..88d7aba 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -10,7 +10,7 @@ require 'test/test_helper' include Unicorn -class TestHandler +class TestHandler def call(env) while env['rack.input'].read(4096) @@ -19,7 +19,7 @@ class TestHandler rescue Unicorn::ClientShutdown, Unicorn::HttpParserError => e $stderr.syswrite("#{e.class}: #{e.message} #{e.backtrace.empty?}\n") raise e - end + end end @@ -169,7 +169,6 @@ class WebServerTest < Test::Unit::TestCase def test_client_malformed_body sock = nil - buf = nil bs = 15653984 assert_nothing_raised do sock = TCPSocket.new('127.0.0.1', @port) @@ -271,7 +270,7 @@ class WebServerTest < Test::Unit::TestCase def test_file_streamed_request body = "a" * (Unicorn::Const::MAX_BODY * 2) long = "PUT /test HTTP/1.1\r\nContent-length: #{body.length}\r\n\r\n" + body - do_test(long, Unicorn::Const::CHUNK_SIZE * 2 -400) + do_test(long, Unicorn::Const::CHUNK_SIZE * 2 - 400) end def test_file_streamed_request_bad_body @@ -279,13 +278,11 @@ class WebServerTest < Test::Unit::TestCase long = "GET /test HTTP/1.1\r\nContent-ength: #{body.length}\r\n\r\n" + body assert_raises(EOFError,Errno::ECONNRESET,Errno::EPIPE,Errno::EINVAL, Errno::EBADF) { - do_test(long, Unicorn::Const::CHUNK_SIZE * 2 -400) + do_test(long, Unicorn::Const::CHUNK_SIZE * 2 - 400) } end def test_listener_names assert_equal [ "127.0.0.1:#@port" ], Unicorn.listener_names end - end - -- cgit v1.2.3-24-ge0c7