rainbows 0.2.0 → 0.3.0

data/t/t3006-revactor-async-response-no-autochunk.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+CONFIG_RU=async-response-no-autochunk.ru
+. ./lib-async-response.sh
+test x"$(cat $a)" = x0123456789
+test x"$(cat $b)" = x0123456789
+test x"$(cat $c)" = x0123456789

data/t/t3100-revactor-rack-input.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-rack-input-hammer.sh

data/t/t3101-revactor-rack-input-trailer.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-input-trailer.sh

data/t/t4000-rev-basic.sh

@@ -1,51 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-require_rev
-
-eval $(unused_listen)
-rtmpfiles unicorn_config pid r_err r_out tmp fifo ok
-rm -f $fifo
-mkfifo $fifo
-
-nr_client=30
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-pid "$pid"
-stderr_path "$r_err"
-stdout_path "$r_out"
-Rainbows! do
-  use :Rev
-  worker_connections 50
-end
-EOF
-
-rainbows -D t4000.ru -c $unicorn_config
-wait_for_pid $pid
-
-echo "single request"
-curl -sSfv http://$listen/
-
-echo "two requests with keepalive"
-curl -sSfv http://$listen/a http://$listen/b > $tmp 2>&1
-grep 'Re-using existing connection' < $tmp
-
-echo "pipelining partial requests"
-req='GET / HTTP/1.1\r\nHost: example.com\r\n'
-(
-	printf "$req"'\r\n'"$req"
-	cat $fifo > $tmp &
-	sleep 1
-	printf 'Connection: close\r\n\r\n'
-	wait
-	echo ok > $ok
-) | socat - TCP:$listen > $fifo
-
-kill $(cat $pid)
-
-test 2 -eq $(grep '^HTTP/1.1' $tmp | wc -l)
-test 2 -eq $(grep '^HTTP/1.1 200 OK' $tmp | wc -l)
-test 1 -eq $(grep '^Connection: keep-alive' $tmp | wc -l)
-test 1 -eq $(grep '^Connection: close' $tmp | wc -l)
-test x"$(cat $ok)" = xok
-! grep Error $r_err
+. ./lib-simple-http.sh

data/t/t4002-rev-graceful.sh

@@ -1,52 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-require_rev
-
-eval $(unused_listen)
-rtmpfiles unicorn_config tmp pid r_err r_out out
-nr_client=10
-cat > $unicorn_config <<EOF
-listen "$listen"
-stderr_path "$r_err"
-stdout_path "$r_out"
-pid "$pid"
-Rainbows! do
-  use :Rev
-end
-EOF
-
-rainbows -D sleep.ru -c $unicorn_config
-wait_for_pid $pid
-
-for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
-do
-	(
-		rtmpfiles fifo tmp
-		rm -f $fifo
-		mkfifo $fifo
-		(
-			printf 'GET /0 HTTP/1.1\r\n'
-			cat $fifo > $tmp &
-			sleep 1
-			printf 'Host: example.com\r\n'
-			sleep 1
-			printf 'Connection: close\r\n'
-			sleep 1
-			printf '\r\n'
-			wait
-		) | socat - TCP:$listen > $fifo
-		fgrep 'Hello' $tmp >> $out || :
-		rm -f $fifo $tmp
-	) &
-done
-
-sleep 2 # potentially racy :<
-kill -QUIT $(cat $pid)
-wait
-
-test x"$(wc -l < $out)" = x$nr_client
-nr=$(sort < $out | uniq | wc -l)
-test "$nr" -eq 1
-
-test x$(sort < $out | uniq) = xHello
-! grep Error $r_err
+. ./lib-graceful.sh

data/t/t4003-rev-parser-error.sh

@@ -1,34 +1,2 @@
 #!/bin/sh
-. ./test-lib.sh
-require_rev
-
-eval $(unused_listen)
-rtmpfiles unicorn_config pid r_err r_out tmp fifo ok
-rm -f $fifo
-mkfifo $fifo
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-pid "$pid"
-stderr_path "$r_err"
-stdout_path "$r_out"
-Rainbows! do
-  use :Rev
-end
-EOF
-
-rainbows -D t4000.ru -c $unicorn_config
-wait_for_pid $pid
-
-(
-	printf 'GET / HTTP/1/1\r\nHost: example.com\r\n\r\n'
-	cat $fifo > $tmp &
-	wait
-	echo ok > $ok
-) | socat - TCP:$listen > $fifo
-
-kill $(cat $pid)
-
-dbgcat tmp
-grep -F 'HTTP/1.1 400 Bad Request' $tmp
-! grep Error $r_err
+. ./lib-parser-error.sh

data/t/t4003-rev-reopen-logs.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-reopen-logs.sh

data/t/t4004-rev-async-response.sh

@@ -0,0 +1,45 @@
+CONFIG_RU=${CONFIG_RU-'async-response.ru'}
+. ./test-lib.sh
+echo "async response for model=$model"
+eval $(unused_listen)
+rtmpfiles unicorn_config a b c r_err r_out pid curl_err
+
+cat > $unicorn_config <<EOF
+listen "$listen"
+stderr_path "$r_err"
+stdout_path "$r_out"
+pid "$pid"
+Rainbows! { use :$model }
+EOF
+
+# can't load Rack::Lint here since it'll cause Rev to slurp
+rainbows -E none -D $CONFIG_RU -c $unicorn_config
+wait_for_pid $pid
+
+t0=$(date +%s)
+( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $a) &
+( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $b) &
+( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | utee $c) &
+wait
+t1=$(date +%s)
+
+rainbows_pid=$(cat $pid)
+kill -QUIT $rainbows_pid
+elapsed=$(( $t1 - $t0 ))
+echo "elapsed=$elapsed < 30"
+test $elapsed -lt 30
+
+dbgcat a
+dbgcat b
+dbgcat c
+dbgcat r_err
+dbgcat curl_err
+test ! -s $curl_err
+check_stderr
+
+while kill -0 $rainbows_pid >/dev/null 2>&1
+do
+	sleep 1
+done
+
+dbgcat r_err

data/t/t4005-rev-large-file-response.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+. ./lib-large-file-response.sh

data/t/t4006-rev-async-response-no-autochunk.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+CONFIG_RU=async-response-no-autochunk.ru
+. ./lib-async-response.sh
+test x"$(cat $a)" = x0123456789
+test x"$(cat $b)" = x0123456789
+test x"$(cat $c)" = x0123456789

data/t/t4100-rev-rack-input.sh

@@ -1,44 +1,2 @@
 #!/bin/sh
-nr_client=${nr_client-25}
-nr=${nr-50}
-
-. ./test-lib.sh
-require_rev
-test -r random_blob || die "random_blob required, run with 'make $0'"
-
-eval $(unused_listen)
-rtmpfiles unicorn_config curl_out curl_err r_err r_out pid
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-pid "$pid"
-stderr_path "$r_err"
-stdout_path "$r_out"
-Rainbows! do
-  use :Rev
-  worker_connections $nr
-end
-EOF
-
-echo pid=$pid
-rainbows -D sha1.ru -c $unicorn_config
-wait_for_pid $pid
-
-start=$(date +%s)
-for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
-do
-	(
-		curl -sSf -T- http://$listen/$i \
-		  < random_blob >> $curl_out 2>> $curl_err
-	) &
-done
-wait
-echo elapsed=$(( $(date +%s) - $start ))
-
-kill $(cat $pid)
-test $nr_client -eq $(wc -l < $curl_out)
-test 1 -eq $(sort < $curl_out | uniq | wc -l)
-blob_sha1=$( expr "$(sha1sum < random_blob)" : '\([a-f0-9]\+\)')
-echo blob_sha1=$blob_sha1
-test x"$blob_sha1" = x"$(sort < $curl_out | uniq)"
-! grep Error $r_err
+. ./lib-rack-input-hammer.sh

data/t/t4101-rev-rack-input-trailer.sh

@@ -1,51 +1,2 @@
 #!/bin/sh
-nr_client=${nr_client-25}
-nr=${nr-50}
-
-. ./test-lib.sh
-require_rev
-test -r random_blob || die "random_blob required, run with 'make $0'"
-
-eval $(unused_listen)
-rtmpfiles unicorn_config tmp r_err r_out pid fifo ok
-rm -f $fifo
-mkfifo $fifo
-
-cat > $unicorn_config <<EOF
-listen "$listen"
-pid "$pid"
-stderr_path "$r_err"
-stdout_path "$r_out"
-Rainbows! do
-  use :Rev
-end
-EOF
-
-rainbows -D content-md5.ru -c $unicorn_config
-wait_for_pid $pid
-
-echo "small blob"
-(
-	echo hello world | content-md5-put
-	cat $fifo > $tmp &
-	wait
-	echo ok > $ok
-) | socat - TCP:$listen | tee $fifo
-
-fgrep 'HTTP/1.1 200 OK' $tmp
-test xok = x"$(cat $ok)"
-! grep Error $r_err
-
-
-echo "big blob"
-(
-	content-md5-put < random_blob
-	cat $fifo > $tmp &
-	wait
-	echo ok > $ok
-) | socat - TCP:$listen | tee $fifo
-
-fgrep 'HTTP/1.1 200 OK' $tmp
-test xok = x"$(cat $ok)"
-! grep Error $r_err
-kill $(cat $pid)
+. ./lib-input-trailer.sh

data/t/t9000-rack-app-pool.sh

@@ -31,7 +31,6 @@ echo elapsed=$(( $(date +%s) - $start ))
 kill $(cat $pid)
 
 test $APP_POOL_SIZE -eq $(sort < $curl_out | uniq | wc -l)
-! test -s $curl_err
+test ! -s $curl_err
 
-! grep Error $r_err
-#
+check_stderr

data/t/test-lib.sh

@@ -1,11 +1,36 @@
 #!/bin/sh
 # Copyright (c) 2009 Rainbows! developers
 
-set -o pipefail >/dev/null 2>&1 || : # non-POSIX, but useful in ksh/bash
+# pipefail is non-POSIX, but useful in ksh/bash
+(
+	set +e
+	set -o pipefail 2>/dev/null
+)
+if test $? -eq 0
+then
+	set -o pipefail
+else
+	echo >&2 "WARNING: your shell does not understand pipefail"
+fi
+
 set -e
-set -u
+
 T=$(basename $0)
-ruby="${ruby-ruby}"
+if test -z "$model"
+then
+	case $T in
+	t1???-thread-pool-*.sh) model=ThreadPool ;;
+	t2???-thread-spawn-*.sh) model=ThreadSpawn ;;
+	t3???-revactor-*.sh) model=Revactor ;;
+	t4???-rev-*.sh) model=Rev ;;
+	*) model=any ;;
+	esac
+fi
+
+ruby="${ruby-'ruby'}"
+RUBY_VERSION=${RUBY_VERSION-$($ruby -e 'puts RUBY_VERSION')}
+t_pfx=$PWD/trash/$T-$RUBY_VERSION
+set -u
 
 # ensure a sane environment
 TZ=UTC LC_ALL=C LANG=C
@@ -17,8 +42,22 @@ die () {
 	exit 1
 }
 
-_TEST_RM_LIST=""
-trap 'rm -f $_TEST_RM_LIST' 0
+_test_on_exit () {
+	code=$?
+	case $code in
+	0)
+		echo "ok $T"
+		rm -f $_TEST_OK_RM_LIST
+	;;
+	*) echo "not ok $T" ;;
+	esac
+	rm -f $_TEST_RM_LIST
+	exit $code
+}
+
+_TEST_RM_LIST=
+_TEST_OK_RM_LIST=
+trap _test_on_exit EXIT
 PATH=$PWD/bin:$PATH
 export PATH
 
@@ -34,18 +73,12 @@ wait_for_pid () {
 	done
 }
 
-require_revactor () {
-	if ! $ruby -rrevactor -e "puts Revactor::VERSION" >/dev/null 2>&1
+require_check () {
+	lib=$1
+	const=$2
+	if ! $ruby -r$lib -e "puts $const" >/dev/null 2>&1
 	then
-		echo >&2 "skipping $T since we don't have Revactor"
-		exit 0
-	fi
-}
-
-require_rev() {
-	if ! $ruby -rrev -e "puts Rev::VERSION" >/dev/null 2>&1
-	then
-		echo >&2 "skipping $T since we don't have Rev"
+		echo >&2 "skipping $T since we don't have $lib"
 		exit 0
 	fi
 }
@@ -55,14 +88,43 @@ require_rev() {
 rtmpfiles () {
 	for id in "$@"
 	do
-		_tmp=$(mktemp -t rainbows.$$.$id.XXXXXXXX)
+		name=$id
+		_tmp=$t_pfx.$id
+		> $_tmp
 		eval "$id=$_tmp"
-		_TEST_RM_LIST="$_TEST_RM_LIST $_tmp"
+		_TEST_OK_RM_LIST="$_TEST_OK_RM_LIST $_tmp"
+
+		case $name in
+		*fifo)
+			rm -f $_tmp
+			mkfifo $_tmp
+			_TEST_RM_LIST="$_TEST_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 Error $_r_err
+	then
+		die "Errors found in $_r_err"
+	elif grep SIGKILL $_r_err
+	then
+		die "SIGKILL found in $_r_err"
+	fi
+}
+
+case $model in
+Rev) require_check rev Rev::VERSION ;;
+Revactor) require_check revactor Revactor::VERSION ;;
+esac