unicorn-lb-patch 4.3.1.11.g21b8.dirty

data/t/t0021-process_detach.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+. ./test-lib.sh
+
+t_plan 5 "Process.detach on forked background process works"
+
+t_begin "setup and startup" && {
+	t_fifos process_detach
+	unicorn_setup
+	TEST_FIFO=$process_detach \
+	  unicorn -E none -D detach.ru -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "read detached PID with HTTP/1.0" && {
+	detached_pid=$(curl -0 -sSf http://$listen/)
+	t_info "detached_pid=$detached_pid"
+}
+
+t_begin "read background FIFO" && {
+	test xHIHI = x"$(cat $process_detach)"
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "check stderr" && check_stderr
+
+t_done

data/t/t0022-listener-names-preload_app.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+. ./test-lib.sh
+
+# Raindrops::Middleware depends on Unicorn.listener_names,
+# ensure we don't break Raindrops::Middleware when preload_app is true
+
+t_plan 4 "Unicorn.listener_names available with preload_app=true"
+
+t_begin "setup and startup" && {
+	unicorn_setup
+        echo preload_app true >> $unicorn_config
+	unicorn -E none -D listener_names.ru -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "read listener names includes listener" && {
+	resp=$(curl -sSf http://$listen/)
+	ok=false
+	t_info "resp=$resp"
+	case $resp in
+	*\"$listen\"*) ok=true ;;
+	esac
+	$ok
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "check stderr" && check_stderr
+
+t_done

data/t/t0100-rack-input-tests.sh

@@ -0,0 +1,124 @@
+#!/bin/sh
+. ./test-lib.sh
+test -r random_blob || die "random_blob required, run with 'make $0'"
+
+t_plan 10 "rack.input read tests"
+
+t_begin "setup and startup" && {
+	rtmpfiles curl_out curl_err
+	unicorn_setup
+	unicorn -E none -D rack-input-tests.ru -c $unicorn_config
+        blob_sha1=$(rsha1 < random_blob)
+	blob_size=$(wc -c < random_blob)
+        t_info "blob_sha1=$blob_sha1"
+	unicorn_wait_start
+}
+
+t_begin "corked identity request" && {
+	rm -f $tmp
+	(
+		cat $fifo > $tmp &
+		printf 'PUT / HTTP/1.0\r\n'
+		printf 'Content-Length: %d\r\n\r\n' $blob_size
+		cat random_blob
+		wait
+		echo ok > $ok
+	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
+	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test x"$(cat $ok)" = xok
+}
+
+t_begin "corked chunked request" && {
+	rm -f $tmp
+	(
+		cat $fifo > $tmp &
+		content-md5-put < random_blob
+		wait
+		echo ok > $ok
+	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
+	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test x"$(cat $ok)" = xok
+}
+
+t_begin "corked identity request (input#size first)" && {
+	rm -f $tmp
+	(
+		cat $fifo > $tmp &
+		printf 'PUT /size_first HTTP/1.0\r\n'
+		printf 'Content-Length: %d\r\n\r\n' $blob_size
+		cat random_blob
+		wait
+		echo ok > $ok
+	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
+	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test x"$(cat $ok)" = xok
+}
+
+t_begin "corked identity request (input#rewind first)" && {
+	rm -f $tmp
+	(
+		cat $fifo > $tmp &
+		printf 'PUT /rewind_first HTTP/1.0\r\n'
+		printf 'Content-Length: %d\r\n\r\n' $blob_size
+		cat random_blob
+		wait
+		echo ok > $ok
+	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
+	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test x"$(cat $ok)" = xok
+}
+
+t_begin "corked chunked request (input#size first)" && {
+	rm -f $tmp
+	(
+		cat $fifo > $tmp &
+		printf 'PUT /size_first HTTP/1.1\r\n'
+		printf 'Host: example.com\r\n'
+		printf 'Transfer-Encoding: chunked\r\n'
+		printf 'Trailer: Content-MD5\r\n'
+		printf '\r\n'
+		content-md5-put --no-headers < random_blob
+		wait
+		echo ok > $ok
+	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
+	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test x"$(cat $ok)" = xok
+}
+
+t_begin "corked chunked request (input#rewind first)" && {
+	rm -f $tmp
+	(
+		cat $fifo > $tmp &
+		printf 'PUT /rewind_first HTTP/1.1\r\n'
+		printf 'Host: example.com\r\n'
+		printf 'Transfer-Encoding: chunked\r\n'
+		printf 'Trailer: Content-MD5\r\n'
+		printf '\r\n'
+		content-md5-put --no-headers < random_blob
+		wait
+		echo ok > $ok
+	) | ( sleep 1 && socat - TCP4:$listen > $fifo )
+	test 1 -eq $(grep $blob_sha1 $tmp |wc -l)
+	test x"$(cat $ok)" = xok
+}
+
+t_begin "regular request" && {
+	curl -sSf -T random_blob http://$listen/ > $curl_out 2> $curl_err
+        test x$blob_sha1 = x$(cat $curl_out)
+        test ! -s $curl_err
+}
+
+t_begin "chunked request" && {
+	curl -sSf -T- < random_blob http://$listen/ > $curl_out 2> $curl_err
+        test x$blob_sha1 = x$(cat $curl_out)
+        test ! -s $curl_err
+}
+
+dbgcat r_err
+
+t_begin "shutdown" && {
+	kill $unicorn_pid
+}
+
+t_done

data/t/t0116-client_body_buffer_size.sh

@@ -0,0 +1,80 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 12 "client_body_buffer_size settings"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rtmpfiles unicorn_config_tmp one_meg
+	dd if=/dev/zero bs=1M count=1 of=$one_meg
+	cat >> $unicorn_config <<EOF
+after_fork do |server, worker|
+  File.open("$fifo", "wb") { |fp| fp.syswrite "START" }
+end
+EOF
+	cat $unicorn_config > $unicorn_config_tmp
+	echo client_body_buffer_size 0 >> $unicorn_config
+	unicorn -D -c $unicorn_config t0116.ru
+	unicorn_wait_start
+	fs_class=Unicorn::TmpIO
+	mem_class=StringIO
+
+	test x"$(cat $fifo)" = xSTART
+}
+
+t_begin "class for a zero-byte file should be StringIO" && {
+	> $tmp
+	test xStringIO = x"$(curl -T $tmp -sSf http://$listen/input_class)"
+}
+
+t_begin "class for a 1 byte file should be filesystem-backed" && {
+	echo > $tmp
+	test x$fs_class = x"$(curl -T $tmp -sSf http://$listen/tmp_class)"
+}
+
+t_begin "reload with default client_body_buffer_size" && {
+	mv $unicorn_config_tmp $unicorn_config
+	kill -HUP $unicorn_pid
+	test x"$(cat $fifo)" = xSTART
+}
+
+t_begin "class for a 1 byte file should be memory-backed" && {
+	echo > $tmp
+	test x$mem_class = x"$(curl -T $tmp -sSf http://$listen/tmp_class)"
+}
+
+t_begin "class for a random blob file should be filesystem-backed" && {
+	resp="$(curl -T random_blob -sSf http://$listen/tmp_class)"
+	test x$fs_class = x"$resp"
+}
+
+t_begin "one megabyte file should be filesystem-backed" && {
+	resp="$(curl -T $one_meg -sSf http://$listen/tmp_class)"
+	test x$fs_class = x"$resp"
+}
+
+t_begin "reload with a big client_body_buffer_size" && {
+	echo "client_body_buffer_size(1024 * 1024)" >> $unicorn_config
+	kill -HUP $unicorn_pid
+	test x"$(cat $fifo)" = xSTART
+}
+
+t_begin "one megabyte file should be memory-backed" && {
+	resp="$(curl -T $one_meg -sSf http://$listen/tmp_class)"
+	test x$mem_class = x"$resp"
+}
+
+t_begin "one megabyte + 1 byte file should be filesystem-backed" && {
+	echo >> $one_meg
+	resp="$(curl -T $one_meg -sSf http://$listen/tmp_class)"
+	test x$fs_class = x"$resp"
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_begin "check stderr" && {
+	check_stderr
+}
+
+t_done

data/t/t0116.ru

@@ -0,0 +1,16 @@
+#\ -E none
+use Rack::ContentLength
+use Rack::ContentType, 'text/plain'
+app = lambda do |env|
+  input = env['rack.input']
+  case env["PATH_INFO"]
+  when "/tmp_class"
+    body = input.instance_variable_get(:@tmp).class.name
+  when "/input_class"
+    body = input.class.name
+  else
+    return [ 500, {}, [] ]
+  end
+  [ 200, {}, [ body ] ]
+end
+run app

data/t/t0300-rails3-basic.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+. ./test-rails3.sh
+
+t_plan 3 "Rails 3 (beta) tests"
+
+t_begin "setup and start" && {
+	rails3_app=$(cd rails3-app && pwd)
+	rm -rf $t_pfx.app
+	mkdir $t_pfx.app
+	cd $t_pfx.app
+	( cd $rails3_app && tar cf - . ) | tar xf -
+	$RAKE db:sessions:create
+	$RAKE db:migrate
+	unicorn_setup
+	unicorn_rails -D -c $unicorn_config
+	unicorn_wait_start
+}
+
+# add more tests here
+t_begin "hit with curl" && {
+	test xHELLO = x"$(curl -sSf http://$listen/x.txt)"
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_done

data/t/t0301-rails3-missing-config-ru.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+. ./test-rails3.sh
+
+t_plan 4 "Rails 3 (beta) tests for config.ru haters"
+
+t_begin "setup and start" && {
+	rails3_app=$(cd rails3-app && pwd)
+	rm -rf $t_pfx.app
+	mkdir $t_pfx.app
+	cd $t_pfx.app
+	( cd $rails3_app && tar cf - . ) | tar xf -
+	rm config.ru
+	$RAKE db:sessions:create
+	$RAKE db:migrate
+	unicorn_setup
+	unicorn_rails -D -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "static file serving works" && {
+	test x"$(curl -sSf http://$listen/x.txt)" = xHELLO
+}
+
+# add more tests here
+t_begin "hit with curl" && {
+	curl -v http://$listen/ || :
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_done

data/t/t0302-rails3-alt-working_directory.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+. ./test-rails3.sh
+
+t_plan 3 "Rails 3 (beta) inside alt working_directory (no config.ru)"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rails3_app=$(cd rails3-app && pwd)
+	rm -rf $t_pfx.app
+	mkdir $t_pfx.app
+	cd $t_pfx.app
+	( cd $rails3_app && tar cf - . ) | tar xf -
+	rm config.ru
+	$RAKE db:sessions:create
+	$RAKE db:migrate
+	unicorn_setup
+	rm $pid
+	echo "working_directory '$t_pfx.app'" >> $unicorn_config
+	cd /
+	unicorn_rails -D -c $unicorn_config
+	unicorn_wait_start
+}
+
+t_begin "static file serving works" && {
+	test x"$(curl -sSf http://$listen/x.txt)" = xHELLO
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_done

data/t/t0303-rails3-alt-working_directory_config.ru.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+. ./test-rails3.sh
+
+t_plan 5 "Rails 3 (beta) inside alt working_directory (w/ config.ru)"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rtmpfiles unicorn_config_tmp usocket
+	if test -e $usocket
+	then
+		die "unexpected $usocket"
+	fi
+	rails3_app=$(cd rails3-app && pwd)
+	rm -rf $t_pfx.app
+	mkdir $t_pfx.app
+	cd $t_pfx.app
+	( cd $rails3_app && tar cf - . ) | tar xf -
+	$RAKE db:sessions:create
+	$RAKE db:migrate
+	unicorn_setup
+	rm $pid
+
+	echo "#\\--daemonize --host $host --port $port -l $usocket" \
+	     >> $t_pfx.app/config.ru
+
+	# we have --host/--port in config.ru instead
+	grep -v ^listen $unicorn_config |
+	  grep -v ^pid > $unicorn_config_tmp
+	echo "working_directory '$t_pfx.app'" >> $unicorn_config_tmp
+	cd /
+	unicorn_rails -c $unicorn_config_tmp
+}
+
+t_begin "pids in the right place" && {
+	if test -e $pid
+	then
+		die "pid=$pid not expected"
+	fi
+
+	unicorn_rails_pid="$t_pfx.app/tmp/pids/unicorn.pid"
+	unicorn_pid=$(cat $unicorn_rails_pid)
+}
+
+t_begin "static file serving works" && {
+	test x"$(curl -sSf http://$listen/x.txt)" = xHELLO
+}
+
+t_begin "socket created" && {
+	test -S $usocket
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_done

data/t/t0304-rails3-alt-working_directory_no_embed_cli.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+. ./test-rails3.sh
+
+t_plan 5 "Rails 3 (beta) inside alt working_directory (no embedded switches)"
+
+t_begin "setup and start" && {
+	unicorn_setup
+	rtmpfiles unicorn_config_tmp usocket
+	if test -e $usocket
+	then
+		die "unexpected $usocket"
+	fi
+	rails3_app=$(cd rails3-app && pwd)
+	rm -rf $t_pfx.app
+	mkdir $t_pfx.app
+	cd $t_pfx.app
+	( cd $rails3_app && tar cf - . ) | tar xf -
+	$RAKE db:sessions:create
+	$RAKE db:migrate
+	unicorn_setup
+	rm $pid
+
+	grep -v ^pid $unicorn_config > $unicorn_config_tmp
+	echo "working_directory '$t_pfx.app'" >> $unicorn_config_tmp
+	cd /
+	unicorn_rails -c $unicorn_config_tmp \
+	  --daemonize --host $host --port $port -l $usocket
+}
+
+t_begin "pids in the right place" && {
+	if test -e $pid
+	then
+		die "pid=$pid not expected"
+	fi
+
+	unicorn_rails_pid="$t_pfx.app/tmp/pids/unicorn.pid"
+	unicorn_pid=$(cat $unicorn_rails_pid)
+}
+
+t_begin "static file serving works" && {
+	test x"$(curl -sSf http://$listen/x.txt)" = xHELLO
+}
+
+t_begin "socket created" && {
+	test -S $usocket
+}
+
+t_begin "killing succeeds" && {
+	kill $unicorn_pid
+}
+
+t_done