unicorn 0.96.1 → 0.97.0

data/t/t0000-http-basic.sh

@@ -0,0 +1,50 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 8 "simple HTTP connection tests"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	unicorn -D -c $unicorn_config env.ru
+	unicorn_wait_start
+}
+
+t_begin "single request" && {
+	curl -sSfv http://$listen/
+}
+
+t_begin "check stderr has no errors" && {
+	check_stderr
+}
+
+t_begin "HTTP/0.9 request should not return headers" && {
+	(
+		printf 'GET /\r\n'
+		cat $fifo > $tmp &
+		wait
+		echo ok > $ok
+	) | socat - TCP:$listen > $fifo
+}
+
+t_begin "env.inspect should've put everything on one line" && {
+	test 1 -eq $(wc -l < $tmp)
+}
+
+t_begin "no headers in output" && {
+	if grep ^Connection: $tmp
+	then
+		die "Connection header found in $tmp"
+	elif grep ^HTTP/ $tmp
+	then
+		die "HTTP/ found in $tmp"
+	fi
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "check stderr has no errors" && {
+	check_stderr
+}
+
+t_done

data/t/t0001-reload-bad-config.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 7 "reload config.ru error with preload_app true"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rtmpfiles ru
+
+	cat > $ru <<\EOF
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+x = { "hello" => "world" }
+run lambda { |env| [ 200, {}, [ x.inspect << "\n" ] ] }
+EOF
+	echo 'preload_app true' >> $unicorn_config
+	unicorn -D -c $unicorn_config $ru
+	unicorn_wait_start
+}
+
+t_begin "hit with curl" && {
+	out=$(curl -sSf http://$listen/)
+	test x"$out" = x'{"hello"=>"world"}'
+}
+
+t_begin "introduce syntax error in rackup file" && {
+	echo '...' >> $ru
+}
+
+t_begin "reload signal succeeds" && {
+	kill -HUP $unicorn_pid
+	while ! egrep '(done|error) reloading' $r_err >/dev/null
+	do
+		sleep 1
+	done
+
+	grep 'error reloading' $r_err >/dev/null
+}
+
+t_begin "hit with curl" && {
+	out=$(curl -sSf http://$listen/)
+	test x"$out" = x'{"hello"=>"world"}'
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "check stderr" && {
+	check_stderr
+}
+
+t_done

data/t/t0002-config-conflict.sh

@@ -0,0 +1,49 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 6 "config variables conflict with preload_app"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rtmpfiles ru rutmp
+
+	cat > $ru <<\EOF
+use Rack::ContentLength
+use Rack::ContentType, "text/plain"
+config = ru = { "hello" => "world" }
+run lambda { |env| [ 200, {}, [ ru.inspect << "\n" ] ] }
+EOF
+	echo 'preload_app true' >> $unicorn_config
+	unicorn -D -c $unicorn_config $ru
+	unicorn_wait_start
+}
+
+t_begin "hit with curl" && {
+	out=$(curl -sSf http://$listen/)
+	test x"$out" = x'{"hello"=>"world"}'
+}
+
+t_begin "modify rackup file" && {
+	sed -e 's/world/WORLD/' < $ru > $rutmp
+	mv $rutmp $ru
+}
+
+t_begin "reload signal succeeds" && {
+	kill -HUP $unicorn_pid
+	while ! egrep '(done|error) reloading' < $r_err >/dev/null
+	do
+		sleep 1
+	done
+
+	grep 'done reloading' $r_err >/dev/null
+}
+
+t_begin "hit with curl" && {
+	out=$(curl -sSf http://$listen/)
+	test x"$out" = x'{"hello"=>"WORLD"}'
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_done

data/t/test-lib.sh

@@ -0,0 +1,100 @@
+#!/bin/sh
+# Copyright (c) 2009 Rainbows! hackers
+# Copyright (c) 2010 Unicorn hackers
+. ./my-tap-lib.sh
+
+set +u
+set -e
+RUBY="${RUBY-ruby}"
+RUBY_VERSION=${RUBY_VERSION-$($RUBY -e 'puts RUBY_VERSION')}
+t_pfx=$PWD/trash/$T-$RUBY_VERSION
+set -u
+
+PATH=$PWD/bin:$PATH
+export PATH
+
+test -x $PWD/bin/unused_listen || die "must be run in 't' directory"
+
+wait_for_pid () {
+	path="$1"
+	nr=30
+	while ! test -s "$path" && test $nr -gt 0
+	do
+		nr=$(($nr - 1))
+		sleep 1
+	done
+}
+
+# given a list of variable names, create temporary files and assign
+# the pathnames to those variables
+rtmpfiles () {
+	for id in "$@"
+	do
+		name=$id
+		_tmp=$t_pfx.$id
+		eval "$id=$_tmp"
+
+		case $name in
+		*fifo)
+			rm -f $_tmp
+			mkfifo $_tmp
+			T_RM_LIST="$T_RM_LIST $_tmp"
+			;;
+		*socket)
+			rm -f $_tmp
+			T_RM_LIST="$T_RM_LIST $_tmp"
+			;;
+		*)
+			> $_tmp
+			T_OK_RM_LIST="$T_OK_RM_LIST $_tmp"
+			;;
+		esac
+	done
+}
+
+dbgcat () {
+	id=$1
+	eval '_file=$'$id
+	echo "==> $id <=="
+	sed -e "s/^/$id:/" < $_file
+}
+
+check_stderr () {
+	set +u
+	_r_err=${1-${r_err}}
+	set -u
+	if grep -v $T $_r_err | grep -i Error
+	then
+		die "Errors found in $_r_err"
+	elif grep SIGKILL $_r_err
+	then
+		die "SIGKILL found in $_r_err"
+	fi
+}
+
+# unicorn_setup
+unicorn_setup () {
+	eval $(unused_listen)
+	rtmpfiles unicorn_config pid r_err r_out fifo tmp ok
+	cat > $unicorn_config <<EOF
+listen "$listen"
+pid "$pid"
+stderr_path "$r_err"
+stdout_path "$r_out"
+EOF
+}
+
+unicorn_wait_start () {
+	# no need to play tricks with FIFOs since we got "ready_pipe" now
+	unicorn_pid=$(cat $pid)
+}
+
+rsha1 () {
+	_cmd="$(which sha1sum 2>/dev/null || :)"
+	test -n "$_cmd" || _cmd="$(which openssl 2>/dev/null || :) sha1"
+	test "$_cmd" != " sha1" || _cmd="$(which gsha1sum 2>/dev/null || :)"
+
+	# last resort, see comments in sha1sum.rb for reasoning
+	test -n "$_cmd" || _cmd=sha1sum.rb
+	expr "$($_cmd < random_blob)" : '\([a-f0-9]\{40\}\)'
+}

data/test/rails/test_rails.rb

@@ -92,9 +92,6 @@ logger Logger.new('#{COMMON_TMP.path}')
     redirect_test_io { @pid = fork { exec 'unicorn_rails', "-l#@addr:#@port" } }
     wait_master_ready("test_stderr.#$$.log")
 
-    # temp dirs exist
-    tmp_dirs.each { |dir| assert(File.directory?("tmp/#{dir}")) }
-
     # basic GET
     res = Net::HTTP.get_response(URI.parse("http://#@addr:#@port/foo"))
     assert_equal "FOO\n", res.body
@@ -102,6 +99,9 @@ logger Logger.new('#{COMMON_TMP.path}')
     assert_equal "4", res['Content-Length']
     assert_equal "200 OK", res['Status']
 
+    # temp dirs exist
+    tmp_dirs.each { |dir| assert(File.directory?("tmp/#{dir}")) }
+
     # can we set cookies?
     res = Net::HTTP.get_response(URI.parse("http://#@addr:#@port/foo/xcookie"))
     assert_equal "200", res.code

data/test/test_helper.rb

@@ -294,3 +294,8 @@ def chunked_spawn(stdout, *cmd)
     end while true
   }
 end
+
+def reset_sig_handlers
+  sigs = %w(CHLD).concat(Unicorn::HttpServer::QUEUE_SIGS)
+  sigs.each { |sig| trap(sig, "DEFAULT") }
+end

data/test/unit/test_http_parser_ng.rb

@@ -1,6 +1,5 @@
 # -*- encoding: binary -*-
 
-# coding: binary
 require 'test/test_helper'
 require 'digest/md5'
 

data/test/unit/test_server.rb

@@ -41,6 +41,7 @@ class WebServerTest < Test::Unit::TestCase
       File.truncate("test_stderr.#$$.log", 0)
       @server.stop(true)
     end
+    reset_sig_handlers
   end
 
   def test_preload_app_config

data/test/unit/test_signals.rb

@@ -40,6 +40,10 @@ class SignalsTest < Test::Unit::TestCase
     @server = nil
   end
 
+  def teardown
+    reset_sig_handlers
+  end
+
   def test_worker_dies_on_dead_master
     pid = fork {
       app = lambda { |env| [ 200, {'X-Pid' => "#$$" }, [] ] }
@@ -190,7 +194,7 @@ class SignalsTest < Test::Unit::TestCase
     killer = fork { loop { Process.kill(:HUP, pid); sleep(0.0001) } }
     buf = ' ' * @bs
     @count.times { sock.syswrite(buf) }
-    Process.kill(:TERM, killer)
+    Process.kill(:KILL, killer)
     Process.waitpid2(killer)
     redirect_test_io { @server.stop(true) }
     # can't check for == since pending signals get merged

data/test/unit/test_tee_input.rb

@@ -71,8 +71,8 @@ class TestTeeInput < Test::Unit::TestCase
     ti = Unicorn::TeeInput.new(@rd, @env, @parser, @buf)
     assert_equal 0, @parser.content_length
     assert @parser.body_eof?
-    assert_equal StringIO, ti.instance_eval { @tmp.class }
-    assert_equal 0, ti.instance_eval { @tmp.pos }
+    assert_equal StringIO, ti.tmp.class
+    assert_equal 0, ti.tmp.pos
     assert_equal 5, ti.size
     assert_equal 'hello', ti.read
     assert_equal '', ti.read
@@ -99,8 +99,8 @@ class TestTeeInput < Test::Unit::TestCase
     ti = Unicorn::TeeInput.new(@rd, @env, @parser, @buf)
     assert_equal 0, @parser.content_length
     assert @parser.body_eof?
-    assert_kind_of File, ti.instance_eval { @tmp }
-    assert_equal 0, ti.instance_eval { @tmp.pos }
+    assert_kind_of File, ti.tmp
+    assert_equal 0, ti.tmp.pos
     assert_equal Unicorn::Const::MAX_BODY + 1, ti.size
   end
 
@@ -125,9 +125,9 @@ class TestTeeInput < Test::Unit::TestCase
     ti = Unicorn::TeeInput.new(@rd, @env, @parser, @buf)
     assert_equal Unicorn::Const::MAX_BODY, @parser.content_length
     assert ! @parser.body_eof?
-    assert_kind_of File, ti.instance_eval { @tmp }
-    assert_equal 0, ti.instance_eval { @tmp.pos }
-    assert_equal 1, ti.instance_eval { @tmp.size }
+    assert_kind_of File, ti.tmp
+    assert_equal 0, ti.tmp.pos
+    assert_equal 1, ti.tmp.size
     assert_equal Unicorn::Const::MAX_BODY + 1, ti.size
     nr = Unicorn::Const::MAX_BODY / 4
     pid = fork {
@@ -165,19 +165,19 @@ class TestTeeInput < Test::Unit::TestCase
     @wr.close
     ti = Unicorn::TeeInput.new(@rd, @env, @parser, @buf)
     assert_nil @parser.content_length
-    assert_nil ti.instance_eval { @size }
+    assert_nil ti.len
     assert ! @parser.body_eof?
     assert_equal 25, ti.size
     assert @parser.body_eof?
-    assert_equal 25, ti.instance_eval { @size }
-    assert_equal 0, ti.instance_eval { @tmp.pos }
+    assert_equal 25, ti.len
+    assert_equal 0, ti.tmp.pos
     assert_nothing_raised { ti.rewind }
-    assert_equal 0, ti.instance_eval { @tmp.pos }
+    assert_equal 0, ti.tmp.pos
     assert_equal 'abcdeabcdeabcdeabcde', ti.read(20)
-    assert_equal 20, ti.instance_eval { @tmp.pos }
+    assert_equal 20, ti.tmp.pos
     assert_nothing_raised { ti.rewind }
-    assert_equal 0, ti.instance_eval { @tmp.pos }
-    assert_kind_of File, ti.instance_eval { @tmp }
+    assert_equal 0, ti.tmp.pos
+    assert_kind_of File, ti.tmp
     status = nil
     assert_nothing_raised { pid, status = Process.waitpid2(pid) }
     assert status.success?
@@ -203,7 +203,7 @@ class TestTeeInput < Test::Unit::TestCase
     }
     ti = Unicorn::TeeInput.new(@rd, @env, @parser, @buf)
     assert_nil @parser.content_length
-    assert_nil ti.instance_eval { @size }
+    assert_nil ti.len
     assert ! @parser.body_eof?
     chunks.each do |chunk|
       wr.write('.')

data/test/unit/test_upload.rb

@@ -55,6 +55,7 @@ class UploadTest < Test::Unit::TestCase
   def teardown
     redirect_test_io { @server.stop(true) } if @server
     @random.close
+    reset_sig_handlers
   end
 
   def test_put

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: unicorn
 version: !ruby/object:Gem::Version 
-  version: 0.96.1
+  version: 0.97.0
 platform: ruby
 authors: 
 - Unicorn hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +00:00
+date: 2010-03-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,8 +98,10 @@ files:
 - examples/echo.ru
 - examples/git.ru
 - examples/init.sh
+- examples/logger_mp_safe.rb
 - examples/nginx.conf
 - examples/unicorn.conf.rb
+- ext/unicorn_http/CFLAGS
 - ext/unicorn_http/c_util.h
 - ext/unicorn_http/common_field_optimization.h
 - ext/unicorn_http/ext_help.h
@@ -126,6 +128,19 @@ files:
 - man/man1/unicorn.1
 - man/man1/unicorn_rails.1
 - setup.rb
+- t/.gitignore
+- t/GNUmakefile
+- t/README
+- t/bin/content-md5-put
+- t/bin/sha1sum.rb
+- t/bin/unused_listen
+- t/bin/utee
+- t/env.ru
+- t/my-tap-lib.sh
+- t/t0000-http-basic.sh
+- t/t0001-reload-bad-config.sh
+- t/t0002-config-conflict.sh
+- t/test-lib.sh
 - test/aggregate.rb
 - test/benchmark/README
 - test/benchmark/dd.ru