diff options
Diffstat (limited to 'test/unit')
-rw-r--r-- | test/unit/test_ccc.rb | 7 | ||||
-rw-r--r-- | test/unit/test_server.rb | 20 | ||||
-rw-r--r-- | test/unit/test_signals.rb | 12 | ||||
-rw-r--r-- | test/unit/test_socket_helper.rb | 2 | ||||
-rw-r--r-- | test/unit/test_upload.rb | 10 |
5 files changed, 26 insertions, 25 deletions
diff --git a/test/unit/test_ccc.rb b/test/unit/test_ccc.rb index 3be1439..0dc72e8 100644 --- a/test/unit/test_ccc.rb +++ b/test/unit/test_ccc.rb @@ -3,6 +3,7 @@ require 'unicorn' require 'io/wait' require 'tempfile' require 'test/unit' +require './test/test_helper' class TestCccTCPI < Test::Unit::TestCase def test_ccc_tcpi @@ -42,7 +43,7 @@ class TestCccTCPI < Test::Unit::TestCase wr.close # make sure the server is running, at least - client = TCPSocket.new(host, port) + client = tcp_socket(host, port) client.write("GET / HTTP/1.1\r\nHost: example.com\r\n\r\n") assert client.wait(10), 'never got response from server' res = client.read @@ -51,13 +52,13 @@ class TestCccTCPI < Test::Unit::TestCase client.close # start a slow request... - sleeper = TCPSocket.new(host, port) + sleeper = tcp_socket(host, port) sleeper.write("GET /sleep HTTP/1.1\r\nHost: example.com\r\n\r\n") # and a bunch of aborted ones nr = 100 nr.times do |i| - client = TCPSocket.new(host, port) + client = tcp_socket(host, port) client.write("GET /collections/#{rand(10000)} HTTP/1.1\r\n" \ "Host: example.com\r\n\r\n") client.close diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index 781750d..bc9a222 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -121,7 +121,7 @@ class WebServerTest < Test::Unit::TestCase @server.start end - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") responses = sock.read(4096) @@ -141,14 +141,14 @@ class WebServerTest < Test::Unit::TestCase @server.start end - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") responses = sock.read(4096) assert_match %r{\AHTTP/1.[01] 200\b}, responses assert_match %r{^after_reply_called: false}, responses - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") responses = sock.read(4096) @@ -166,7 +166,7 @@ class WebServerTest < Test::Unit::TestCase @server = HttpServer.new(app, :listeners => [ "127.0.0.1:#@port"] ) @server.start end - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") assert_match %r{\AHTTP/1.[01] 500\b}, sock.sysread(4096) assert_nil sock.close @@ -179,7 +179,7 @@ class WebServerTest < Test::Unit::TestCase def test_client_shutdown_writes bs = 15609315 * rand - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("PUT /hello HTTP/1.1\r\n") sock.syswrite("Host: example.com\r\n") sock.syswrite("Transfer-Encoding: chunked\r\n") @@ -206,7 +206,7 @@ class WebServerTest < Test::Unit::TestCase def test_client_shutdown_write_truncates bs = 15609315 * rand - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("PUT /hello HTTP/1.1\r\n") sock.syswrite("Host: example.com\r\n") sock.syswrite("Transfer-Encoding: chunked\r\n") @@ -232,7 +232,7 @@ class WebServerTest < Test::Unit::TestCase def test_client_malformed_body bs = 15653984 - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("PUT /hello HTTP/1.1\r\n") sock.syswrite("Host: example.com\r\n") sock.syswrite("Transfer-Encoding: chunked\r\n") @@ -254,7 +254,7 @@ class WebServerTest < Test::Unit::TestCase def do_test(string, chunk, close_after=nil, shutdown_delay=0) # Do not use instance variables here, because it needs to be thread safe - socket = TCPSocket.new("127.0.0.1", @port); + socket = tcp_socket("127.0.0.1", @port); request = StringIO.new(string) chunks_out = 0 @@ -299,14 +299,14 @@ class WebServerTest < Test::Unit::TestCase end def test_bad_client_400 - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\nHost: foo\rbar\r\n\r\n") assert_match %r{\AHTTP/1.[01] 400\b}, sock.sysread(4096) assert_nil sock.close end def test_http_0_9 - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET /hello\r\n") assert_match 'hello!\n', sock.sysread(4096) assert_nil sock.close diff --git a/test/unit/test_signals.rb b/test/unit/test_signals.rb index 4d9fdc5..56a7dfc 100644 --- a/test/unit/test_signals.rb +++ b/test/unit/test_signals.rb @@ -52,7 +52,7 @@ class SignalsTest < Test::Unit::TestCase redirect_test_io { HttpServer.new(app, opts).start.join } } wait_workers_ready("test_stderr.#{pid}.log", 1) - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") buf = sock.readpartial(4096) assert_nil sock.close @@ -79,7 +79,7 @@ class SignalsTest < Test::Unit::TestCase } wr.close wait_workers_ready("test_stderr.#{pid}.log", 1) - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") buf = rd.readpartial(1) wait_master_ready("test_stderr.#{pid}.log") @@ -102,7 +102,7 @@ class SignalsTest < Test::Unit::TestCase } t0 = Time.now wait_workers_ready("test_stderr.#{pid}.log", 1) - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") buf = nil @@ -125,7 +125,7 @@ class SignalsTest < Test::Unit::TestCase } redirect_test_io { @server = HttpServer.new(app, @server_opts).start } wait_workers_ready("test_stderr.#{$$}.log", 1) - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") buf = '' header_len = pid = nil @@ -163,13 +163,13 @@ class SignalsTest < Test::Unit::TestCase redirect_test_io { @server = HttpServer.new(app, @server_opts).start } wait_workers_ready("test_stderr.#{$$}.log", 1) - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("GET / HTTP/1.0\r\n\r\n") pid = sock.sysread(4096)[/\r\nX-Pid: (\d+)\r\n/, 1].to_i assert_nil sock.close assert pid > 0, "pid not positive: #{pid.inspect}" - sock = TCPSocket.new('127.0.0.1', @port) + sock = tcp_socket('127.0.0.1', @port) sock.syswrite("PUT / HTTP/1.0\r\n") sock.syswrite("Content-Length: #{@bs * @count}\r\n\r\n") 1000.times { Process.kill(:HUP, pid) } diff --git a/test/unit/test_socket_helper.rb b/test/unit/test_socket_helper.rb index fbc7bb9..62d5a3a 100644 --- a/test/unit/test_socket_helper.rb +++ b/test/unit/test_socket_helper.rb @@ -116,7 +116,7 @@ class TestSocketHelper < Test::Unit::TestCase client.syswrite('abcde') exit 0 end - s = UNIXSocket.new(@unix_listener_path) + s = unix_socket(@unix_listener_path) IO.select([s]) assert_equal 'abcde', s.sysread(5) pid, status = Process.waitpid2(pid) diff --git a/test/unit/test_upload.rb b/test/unit/test_upload.rb index 8d90e50..76e6c1c 100644 --- a/test/unit/test_upload.rb +++ b/test/unit/test_upload.rb @@ -60,7 +60,7 @@ class UploadTest < Test::Unit::TestCase def test_put start_server(@sha1_app) - sock = TCPSocket.new(@addr, @port) + sock = tcp_socket(@addr, @port) sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n") @count.times do |i| buf = @random.sysread(@bs) @@ -77,7 +77,7 @@ class UploadTest < Test::Unit::TestCase def test_put_content_md5 md5 = Digest::MD5.new start_server(@sha1_app) - sock = TCPSocket.new(@addr, @port) + sock = tcp_socket(@addr, @port) sock.syswrite("PUT / HTTP/1.0\r\nTransfer-Encoding: chunked\r\n" \ "Trailer: Content-MD5\r\n\r\n") @count.times do |i| @@ -103,7 +103,7 @@ class UploadTest < Test::Unit::TestCase @count, @bs = 2, 128 start_server(@sha1_app) assert_equal 256, length - sock = TCPSocket.new(@addr, @port) + sock = tcp_socket(@addr, @port) hdr = "PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n" @count.times do buf = @random.sysread(@bs) @@ -122,7 +122,7 @@ class UploadTest < Test::Unit::TestCase def test_put_keepalive_truncates_small_overwrite start_server(@sha1_app) - sock = TCPSocket.new(@addr, @port) + sock = tcp_socket(@addr, @port) to_upload = length + 1 sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{to_upload}\r\n\r\n") @count.times do @@ -155,7 +155,7 @@ class UploadTest < Test::Unit::TestCase tmp.write(nr.to_s) [ 200, @hdr, [] ] }) - sock = TCPSocket.new(@addr, @port) + sock = tcp_socket(@addr, @port) buf = ' ' * @bs sock.syswrite("PUT / HTTP/1.0\r\nContent-Length: #{length}\r\n\r\n") |