about summary refs log tree commit homepage
path: root/test
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-06-30 17:15:56 -0700
committerEric Wong <normalperson@yhbt.net>2009-06-30 17:20:13 -0700
commit20bf660a3efff9229c81b3b3a0feb6844bc27a7c (patch)
tree004553b916743a54361ba8ca4716d6b63d5cd73e /test
parentf01c1d4071e8ce30aa6806fd3cd8eec7491bf06c (diff)
downloadunicorn-20bf660a3efff9229c81b3b3a0feb6844bc27a7c.tar.gz
Support for the "Trailer:" header and associated Trailer
lines should be reasonably well supported now
Diffstat (limited to 'test')
-rw-r--r--test/unit/test_chunked_reader.rb37
-rw-r--r--test/unit/test_upload.rb27
2 files changed, 52 insertions, 12 deletions
diff --git a/test/unit/test_chunked_reader.rb b/test/unit/test_chunked_reader.rb
index 6a26c8f..67fe43b 100644
--- a/test/unit/test_chunked_reader.rb
+++ b/test/unit/test_chunked_reader.rb
@@ -8,6 +8,7 @@ require 'digest/sha1'
 class TestChunkedReader < Test::Unit::TestCase
 
   def setup
+    @env = {}
     @rd, @wr = IO.pipe
     @rd.binmode
     @wr.binmode
@@ -27,7 +28,7 @@ class TestChunkedReader < Test::Unit::TestCase
   end
 
   def test_error
-    cr = bin_reader(@rd, "8\r\nasdfasdf\r\n8\r\nasdfasdfa#{'a' * 1024}")
+    cr = bin_reader("8\r\nasdfasdf\r\n8\r\nasdfasdfa#{'a' * 1024}")
     a = nil
     assert_nothing_raised { a = cr.readpartial(8192) }
     assert_equal 'asdfasdf', a
@@ -37,30 +38,30 @@ class TestChunkedReader < Test::Unit::TestCase
   end
 
   def test_eof1
-    cr = bin_reader(@rd, "0\r\n")
+    cr = bin_reader("0\r\n")
     assert_raises(EOFError) { cr.readpartial(8192) }
   end
 
   def test_eof2
-    cr = bin_reader(@rd, "0\r\n\r\n")
+    cr = bin_reader("0\r\n\r\n")
     assert_raises(EOFError) { cr.readpartial(8192) }
   end
 
   def test_readpartial1
-    cr = bin_reader(@rd, "4\r\nasdf\r\n0\r\n")
+    cr = bin_reader("4\r\nasdf\r\n0\r\n")
     assert_equal 'asdf', cr.readpartial(8192)
     assert_raises(EOFError) { cr.readpartial(8192) }
   end
 
   def test_gets1
-    cr = bin_reader(@rd, "4\r\nasdf\r\n0\r\n")
+    cr = bin_reader("4\r\nasdf\r\n0\r\n")
     STDOUT.sync = true
     assert_equal 'asdf', cr.gets
     assert_raises(EOFError) { cr.readpartial(8192) }
   end
 
   def test_gets2
-    cr = bin_reader(@rd, "4\r\nasd\n\r\n0\r\n\r\n")
+    cr = bin_reader("4\r\nasd\n\r\n0\r\n\r\n")
     assert_equal "asd\n", cr.gets
     assert_nil cr.gets
   end
@@ -70,7 +71,7 @@ class TestChunkedReader < Test::Unit::TestCase
     str = ('a' * max).freeze
     first = 5
     last = str.size - first
-    cr = bin_reader(@rd,
+    cr = bin_reader(
       "#{'%x' % first}\r\n#{str[0, first]}\r\n" \
       "#{'%x' % last}\r\n#{str[-last, last]}\r\n" \
       "0\r\n")
@@ -83,7 +84,7 @@ class TestChunkedReader < Test::Unit::TestCase
     str = ('a' * max).freeze
     first = 5
     last = str.size - first
-    cr = bin_reader(@rd,
+    cr = bin_reader(
       "#{'%x' % first}\r\n#{str[0, first]}\r\n" \
       "#{'%x' % last}\r\n#{str[-last, last]}\r\n" \
       "0\r\n")
@@ -101,7 +102,7 @@ class TestChunkedReader < Test::Unit::TestCase
     str = ("z\n" * max).freeze
     first = 5
     last = str.size - first
-    cr = bin_reader(@rd,
+    cr = bin_reader(
       "#{'%x' % first}\r\n#{str[0, first]}\r\n" \
       "#{'%x' % last}\r\n#{str[-last, last]}\r\n" \
       "0\r\n")
@@ -110,7 +111,7 @@ class TestChunkedReader < Test::Unit::TestCase
   end
 
   def test_dd
-    cr = bin_reader(@rd, "6\r\nhello\n\r\n")
+    cr = bin_reader("6\r\nhello\n\r\n")
     tmp = Tempfile.new('test_dd')
     tmp.sync = true
 
@@ -157,11 +158,23 @@ class TestChunkedReader < Test::Unit::TestCase
     assert_equal sha1_file.hexdigest, sha1.hexdigest
   end
 
+  def test_trailer
+    @env['HTTP_TRAILER'] = 'Content-MD5'
+    pid = fork { @wr.syswrite("Content-MD5: asdf\r\n") }
+    cr = bin_reader("8\r\nasdfasdf\r\n8\r\nasdfasdf\r\n0\r\n")
+    assert_equal 'asdfasdf', cr.readpartial(4096)
+    assert_equal 'asdfasdf', cr.readpartial(4096)
+    assert_raises(EOFError) { cr.readpartial(4096) }
+    pid, status = Process.waitpid2(pid)
+    assert status.success?
+    assert_equal 'asdf', @env['HTTP_CONTENT_MD5']
+  end
+
 private
 
-  def bin_reader(sock, buf)
+  def bin_reader(buf)
     buf.force_encoding(Encoding::BINARY) if buf.respond_to?(:force_encoding)
-    Unicorn::ChunkedReader.new(sock, buf)
+    Unicorn::ChunkedReader.new(@env, @rd, buf)
   end
 
 end
diff --git a/test/unit/test_upload.rb b/test/unit/test_upload.rb
index b69ba4e..37baa30 100644
--- a/test/unit/test_upload.rb
+++ b/test/unit/test_upload.rb
@@ -1,5 +1,6 @@
 # Copyright (c) 2009 Eric Wong
 require 'test/test_helper'
+require 'digest/md5'
 
 include Unicorn
 
@@ -43,6 +44,7 @@ class UploadTest < Test::Unit::TestCase
         end
       end
       resp[:size] = input.size
+      resp[:content_md5] = env['HTTP_CONTENT_MD5']
 
       [ 200, @hdr.merge({'X-Resp' => resp.inspect}), [] ]
     end
@@ -69,6 +71,31 @@ class UploadTest < Test::Unit::TestCase
     assert_equal @sha1.hexdigest, resp[:sha1]
   end
 
+  def test_put_content_md5
+    md5 = Digest::MD5.new
+    start_server(@sha1_app)
+    sock = TCPSocket.new(@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|
+      buf = @random.sysread(@bs)
+      @sha1.update(buf)
+      md5.update(buf)
+      sock.syswrite("#{'%x' % buf.size}\r\n")
+      sock.syswrite(buf << "\r\n")
+    end
+    sock.syswrite("0\r\n")
+
+    content_md5 = [ md5.digest! ].pack('m').strip.freeze
+    sock.syswrite("Content-MD5: #{content_md5}\r\n")
+    read = sock.read.split(/\r\n/)
+    assert_equal "HTTP/1.1 200 OK", read[0]
+    resp = eval(read.grep(/^X-Resp: /).first.sub!(/X-Resp: /, ''))
+    assert_equal length, resp[:size]
+    assert_equal @sha1.hexdigest, resp[:sha1]
+    assert_equal content_md5, resp[:content_md5]
+  end
+
   def test_put_trickle_small
     @count, @bs = 2, 128
     start_server(@sha1_app)