rainbows 4.4.3 → 4.5.0

data/t/t0100-rack-input-hammer-content-length.sh

@@ -17,7 +17,7 @@ t_begin "setup and startup" && {
 }
 
 t_begin "send $nr_client concurrent requests" && {
-	start=$(date +%s)
+	start=$(unix_time)
 	for i in $(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)
 	do
 		(
@@ -26,17 +26,17 @@ t_begin "send $nr_client concurrent requests" && {
 		) &
 	done
 	wait
-	t_info elapsed=$(( $(date +%s) - $start ))
+	t_info elapsed=$(( $(unix_time) - $start ))
 }
 
 t_begin "kill server" && kill $rainbows_pid
 
 t_begin "got $nr_client responses" && {
-	test $nr_client -eq $(wc -l < $curl_out)
+	test $nr_client -eq $(count_lines < $curl_out)
 }
 
 t_begin "all responses identical" && {
-	test 1 -eq $(sort < $curl_out | uniq | wc -l)
+	test 1 -eq $(sort < $curl_out | uniq | count_lines)
 }
 
 t_begin "sha1 matches on-disk sha1" && {

data/t/t0106-rack-input-keepalive.sh

@@ -8,9 +8,9 @@ t_begin "setup and startup" && {
 	rtmpfiles req
 	rainbows -D sha1.ru -c $unicorn_config
 	body=hello
-	body_size=$(printf $body | wc -c)
+	body_size=$(printf $body | count_bytes)
 	body_sha1=$(printf $body | rsha1)
-	random_blob_size=$(wc -c < random_blob)
+	random_blob_size=$(count_bytes < random_blob)
 	random_blob_sha1=$(rsha1 < random_blob)
 	rainbows_wait_start
 }
@@ -34,7 +34,7 @@ t_begin "send big pipelined chunked requests" && {
 
 t_begin "check responses" && {
 	dbgcat tmp
-	test 4 -eq $(grep $random_blob_sha1 $tmp | wc -l)
+	test 4 -eq $(grep $random_blob_sha1 $tmp | count_lines)
 }
 
 t_begin "send big pipelined identity requests" && {
@@ -58,7 +58,7 @@ t_begin "send big pipelined identity requests" && {
 
 t_begin "check responses" && {
 	dbgcat tmp
-	test 3 -eq $(grep $random_blob_sha1 $tmp | wc -l)
+	test 3 -eq $(grep $random_blob_sha1 $tmp | count_lines)
 }
 
 t_begin "send pipelined identity requests" && {
@@ -83,7 +83,7 @@ t_begin "send pipelined identity requests" && {
 
 t_begin "check responses" && {
 	dbgcat tmp
-	test 3 -eq $(grep $body_sha1 $tmp | wc -l)
+	test 3 -eq $(grep $body_sha1 $tmp | count_lines)
 }
 
 t_begin "send pipelined chunked requests" && {
@@ -111,7 +111,7 @@ t_begin "send pipelined chunked requests" && {
 
 t_begin "check responses" && {
 	dbgcat tmp
-	test 3 -eq $(grep $body_sha1 $tmp | wc -l)
+	test 3 -eq $(grep $body_sha1 $tmp | count_lines)
 }
 
 t_begin "kill server" && kill $rainbows_pid

data/t/t0200-async-response.sh

@@ -25,12 +25,12 @@ t_begin "setup and start" && {
 }
 
 t_begin "send async requests off in parallel" && {
-	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) &
+	t0=$(unix_time)
+	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | tee $a) &
+	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | tee $b) &
+	( curl --no-buffer -sSf http://$listen/ 2>> $curl_err | tee $c) &
 	wait
-	t1=$(date +%s)
+	t1=$(unix_time)
 }
 
 t_begin "ensure elapsed requests were processed in parallel" && {

data/t/t0202-async-response-one-oh.sh

@@ -16,13 +16,13 @@ t_begin "setup and start" && {
 }
 
 t_begin "send async requests off in parallel" && {
-	t0=$(date +%s)
+	t0=$(unix_time)
 	curl="curl -0 --no-buffer -vsSf http://$listen/"
-	( $curl 2>> $a_err | utee $a) &
-	( $curl 2>> $b_err | utee $b) &
-	( $curl 2>> $c_err | utee $c) &
+	( $curl 2>> $a_err | tee $a) &
+	( $curl 2>> $b_err | tee $b) &
+	( $curl 2>> $c_err | tee $c) &
 	wait
-	t1=$(date +%s)
+	t1=$(unix_time)
 }
 
 t_begin "ensure elapsed requests were processed in parallel" && {

data/t/t0300-async_sinatra.sh

@@ -24,15 +24,15 @@ t_begin "setup and start" && {
 }
 
 t_begin "send async requests off in parallel" && {
-	t0=$(date +%s)
-	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | utee $a) &
-	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | utee $b) &
-	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | utee $c) &
+	t0=$(unix_time)
+	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | tee $a) &
+	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | tee $b) &
+	( curl --no-buffer -sSf http://$listen/$n 2>> $curl_err | tee $c) &
 }
 
 t_begin "ensure elapsed requests were processed in parallel" && {
 	wait
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	echo "elapsed=$elapsed < 30"
 	test $elapsed -lt 30

data/t/t0400-em-async-app.sh

@@ -23,7 +23,7 @@ t_begin "setup and start" && {
 }
 
 t_begin "send async requests off in parallel" && {
-	t0=$(date +%s)
+	t0=$(unix_time)
 	curl --no-buffer -sSf http://$listen/ > $a 2>> $curl_err &
 	curl --no-buffer -sSf http://$listen/ > $b 2>> $curl_err &
 	curl --no-buffer -sSf http://$listen/ > $c 2>> $curl_err &
@@ -31,7 +31,7 @@ t_begin "send async requests off in parallel" && {
 
 t_begin "wait for curl terminations" && {
 	wait
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	t_info "elapsed=$elapsed"
 }

data/t/t0401-em-async-tailer.sh

@@ -27,7 +27,7 @@ t_begin "setup and start" && {
 }
 
 t_begin "send async requests off in parallel" && {
-	t0=$(date +%s)
+	t0=$(unix_time)
 	curl --no-buffer -sSf http://$listen/ > $a 2>> $curl_err &
 	curl_a=$!
 	curl --no-buffer -sSf http://$listen/ > $b 2>> $curl_err &
@@ -49,7 +49,7 @@ t_begin "generate log output" && {
 t_begin "kill curls and wait for termination" && {
 	kill $curl_a $curl_b $curl_c
 	wait
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	t_info "elapsed=$elapsed"
 }

data/t/t0402-async-keepalive.sh

@@ -28,7 +28,7 @@ t_begin "setup and start" && {
 
 t_begin "async.callback supports pipelining" && {
 	rm -f $tmp
-	t0=$(date +%s)
+	t0=$(unix_time)
 	(
 		cat $fifo > $tmp &
 		printf 'GET /0 HTTP/1.1\r\nHost: example.com\r\n\r\n'
@@ -36,17 +36,17 @@ t_begin "async.callback supports pipelining" && {
 		printf 'GET /2 HTTP/1.0\r\nHost: example.com\r\n\r\n'
 		wait
 	) | socat - TCP:$listen > $fifo
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	t_info "elapsed=$elapsed $model.$0 ($t_current)"
-	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | wc -l)"
-	test 3 -eq "$(grep '^Hello ' $tmp | wc -l)"
-	test 3 -eq "$(grep 'World ' $tmp | wc -l)"
+	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | count_lines)"
+	test 3 -eq "$(grep '^Hello ' $tmp | count_lines)"
+	test 3 -eq "$(grep 'World ' $tmp | count_lines)"
 }
 
 t_begin "async.callback supports delayed pipelining" && {
 	rm -f $tmp
-	t0=$(date +%s)
+	t0=$(unix_time)
 	(
 		cat $fifo > $tmp &
 		printf 'GET /0 HTTP/1.1\r\nHost: example.com\r\n\r\n'
@@ -56,17 +56,17 @@ t_begin "async.callback supports delayed pipelining" && {
 		printf 'GET /2 HTTP/1.0\r\nHost: example.com\r\n\r\n'
 		wait
 	) | socat - TCP:$listen > $fifo
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	t_info "elapsed=$elapsed $model.$0 ($t_current)"
-	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | wc -l)"
-	test 3 -eq "$(grep '^Hello ' $tmp | wc -l)"
-	test 3 -eq "$(grep 'World ' $tmp | wc -l)"
+	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | count_lines)"
+	test 3 -eq "$(grep '^Hello ' $tmp | count_lines)"
+	test 3 -eq "$(grep 'World ' $tmp | count_lines)"
 }
 
 t_begin "async.callback supports pipelining with delay $DELAY" && {
 	rm -f $tmp
-	t0=$(date +%s)
+	t0=$(unix_time)
 	(
 		cat $fifo > $tmp &
 		printf 'GET /0 HTTP/1.1\r\nX-Delay: %d\r\n' $DELAY
@@ -77,43 +77,43 @@ t_begin "async.callback supports pipelining with delay $DELAY" && {
 		printf 'Host: example.com\r\n\r\n'
 		wait
 	) | socat - TCP:$listen > $fifo
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	min=$(( $DELAY * 3 ))
 	t_info "elapsed=$elapsed $model.$0 ($t_current) min=$min"
 	test $elapsed -ge $min
-	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | wc -l)"
-	test 3 -eq "$(grep '^Hello ' $tmp | wc -l)"
-	test 3 -eq "$(grep 'World ' $tmp | wc -l)"
+	test 3 -eq "$(fgrep 'HTTP/1.1 200 OK' $tmp | count_lines)"
+	test 3 -eq "$(grep '^Hello ' $tmp | count_lines)"
+	test 3 -eq "$(grep 'World ' $tmp | count_lines)"
 }
 
 t_begin "async.callback supports keepalive" && {
-	t0=$(date +%s)
+	t0=$(unix_time)
 	curl -v --no-buffer -sSf http://$listen/[0-2] > $tmp 2>> $curl_err
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	t_info "elapsed=$elapsed $model.$0 ($t_current)"
 	cmp $expect $tmp
-	test 2 -eq "$(fgrep 'Re-using existing connection!' $curl_err |wc -l)"
+	test 2 -eq "$(fgrep 'Re-using existing connection!' $curl_err |count_lines)"
 	rm -f $curl_err
 }
 
 t_begin "async.callback supports keepalive with delay $DELAY" && {
-	t0=$(date +%s)
+	t0=$(unix_time)
 	curl -v --no-buffer -sSf -H "X-Delay: $DELAY" \
 	  http://$listen/[0-2] > $tmp 2>> $curl_err
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	min=$(( $DELAY * 3 ))
 	t_info "elapsed=$elapsed $model.$0 ($t_current) min=$min"
 	test $elapsed -ge $min
 	cmp $expect $tmp
-	test 2 -eq "$(fgrep 'Re-using existing connection!' $curl_err |wc -l)"
+	test 2 -eq "$(fgrep 'Re-using existing connection!' $curl_err |count_lines)"
 	rm -f $curl_err
 }
 
 t_begin "send async requests off in parallel" && {
-	t0=$(date +%s)
+	t0=$(unix_time)
 	curl --no-buffer -sSf http://$listen/[0-2] > $a 2>> $curl_err &
 	curl --no-buffer -sSf http://$listen/[0-2] > $b 2>> $curl_err &
 	curl --no-buffer -sSf http://$listen/[0-2] > $c 2>> $curl_err &
@@ -121,7 +121,7 @@ t_begin "send async requests off in parallel" && {
 
 t_begin "wait for curl terminations" && {
 	wait
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	t_info "elapsed=$elapsed"
 }

data/t/t0500-cramp-streaming.sh

@@ -32,7 +32,7 @@ check () {
 		i=0
 		while read hello world
 		do
-			t1=$(date +%s)
+			t1=$(unix_time)
 			diff=$(($t1 - $t0))
 			t_info "i=$i diff=$diff hello=$hello world=$world"
 			test $diff -ge 1 || echo "$i: diff: $diff < 1 second"
@@ -46,7 +46,7 @@ check () {
 }
 
 t_begin "send async requests off in parallel" && {
-	t0=$(date +%s)
+	t0=$(unix_time)
 	curl --no-buffer -sSf http://$listen/ 2>> $curl_err | check >$a 2>&1 &
 	curl --no-buffer -sSf http://$listen/ 2>> $curl_err | check >$b 2>&1 &
 	curl --no-buffer -sSf http://$listen/ 2>> $curl_err | check >$c 2>&1 &
@@ -54,7 +54,7 @@ t_begin "send async requests off in parallel" && {
 
 t_begin "wait for curl terminations" && {
 	wait
-	t1=$(date +%s)
+	t1=$(unix_time)
 	elapsed=$(( $t1 - $t0 ))
 	t_info "elapsed=$elapsed (should be 4-5s)"
 }

data/t/t0600-rack-fiber_pool.sh

@@ -43,7 +43,7 @@ t_begin "no errors from curl" && {
 t_begin "no errors in stderr" && check_stderr
 
 t_begin "ensure we hit 3 separate fibers" && {
-	test x3 = x"$(sort < $curl_out | uniq | wc -l)"
+	test x3 = x"$(sort < $curl_out | uniq | count_lines)"
 }
 
 t_done

data/t/t0700-app-deferred.sh

@@ -25,8 +25,8 @@ t_begin "synchronous requests run in the same thread" && {
 	curl --no-buffer -sSf http://$listen/ >> $sync_out 2>> $sync_err &
 	wait
 	test ! -s $sync_err
-	test 3 -eq "$(wc -l < $sync_out)"
-	test 1 -eq "$(uniq < $sync_out | wc -l)"
+	test 3 -eq "$(count_lines < $sync_out)"
+	test 1 -eq "$(uniq < $sync_out | count_lines)"
 }
 
 t_begin "deferred requests run in a different thread" && {

data/t/t0800-rack-hijack.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+. ./test-lib.sh
+t_plan 5 "rack.hijack tests (Rack 1.5+ (Rack::VERSION >= [1,2]))"
+
+t_begin "setup and start" && {
+	rainbows_setup
+	rainbows -D -c $unicorn_config hijack.ru
+	rainbows_wait_start
+}
+
+t_begin "check request hijack" && {
+	test "xrequest.hijacked" = x"$(curl -sSfv http://$listen/hijack_req)"
+}
+
+t_begin "check response hijack" && {
+	test "xresponse.hijacked" = x"$(curl -sSfv http://$listen/hijack_res)"
+}
+
+t_begin "killing succeeds" && {
+	kill $rainbows_pid
+}
+
+t_begin "check stderr" && {
+	check_stderr
+}
+
+t_done

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

@@ -19,14 +19,14 @@ t_begin "configure and start" && {
 }
 
 t_begin "launch $nr_client requests" && {
-	start=$(date +%s)
+	start=$(unix_time)
 	seq="$(awk "BEGIN{for(i=0;i<$nr_client;++i) print i}" </dev/null)"
 	for i in $seq
 	do
 		curl -sSf http://$listen/ >> $curl_out 2>> $curl_err &
 	done
 	wait
-	t_info elapsed=$(( $(date +%s) - $start ))
+	t_info elapsed=$(( $(unix_time) - $start ))
 }
 
 t_begin "kill server" && {
@@ -34,7 +34,7 @@ t_begin "kill server" && {
 }
 
 t_begin "$APP_POOL_SIZE instances of app were used" && {
-	test $APP_POOL_SIZE -eq $(sort < $curl_out | uniq | wc -l)
+	test $APP_POOL_SIZE -eq $(sort < $curl_out | uniq | count_lines)
 }
 
 t_begin "no errors in curl stderr" && {

data/t/t9001-sendfile-to-path.sh

@@ -40,7 +40,7 @@ t_begin "X-Sendfile does not show up in headers" && {
 }
 
 t_begin "Content-Length is set correctly in headers" && {
-	expect=$(wc -c < random_blob)
+	expect=$(count_bytes < random_blob)
 	grep "^< Content-Length: $expect" $curl_err
 }
 

data/t/t9100-thread-timeout.sh

@@ -37,7 +37,7 @@ t_begin "short requests do not timeout while making a long one" && {
 	test x"HI" = x"$(curl -sSf http://$listen/)"
 	wait
 	test -f $ok
-	test 20 -eq $(grep '^HI$' $ok | wc -l)
+	test 20 -eq $(grep '^HI$' $ok | count_lines)
 	test x = x"$(grep -v '^HI$' $ok)"
 	grep 408 $curl_err
 }

data/t/t9101-thread-timeout-threshold.sh

@@ -23,7 +23,7 @@ t_begin "8 sleepy requests do not time out" && {
 		  2>> $curl_err >> $curl_out &
 	done
 	wait
-	test 8 -eq "$(wc -l < $curl_out)"
+	test 8 -eq "$(count_lines < $curl_out)"
 	test xHI = x"$(sort < $curl_out | uniq)"
 }
 

data/t/test-lib.sh

@@ -38,6 +38,21 @@ require_check () {
 	fi
 }
 
+# "date +%s" is not in POSIX, but in GNU, and FreeBSD 9.0 (possibly earlier)
+unix_time () {
+	$RUBY -e 'puts Time.now.to_i'
+}
+
+# "wc -l" outputs leading whitespace on *BSDs, filter it out for portability
+count_lines () {
+	wc -l | tr -d '[:space:]'
+}
+
+# "wc -c" outputs leading whitespace on *BSDs, filter it out for portability
+count_bytes () {
+	wc -c | tr -d '[:space:]'
+}
+
 skip_models () {
 	for i in "$@"
 	do

data/t/test_isolate.rb

@@ -16,10 +16,11 @@ $stdout.reopen($stderr)
 lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
-  gem 'kgio', '2.7.4'
-  gem 'kcar', '0.3.0'
+  gem 'kgio', '2.8.0'
+  gem 'rack', '1.5.2'
+  gem 'kcar', '0.4.0'
   gem 'raindrops', '0.10.0'
-  gem 'unicorn', '4.3.1'
+  gem 'unicorn', '4.6.2'
 
   if engine == "ruby"
     gem 'sendfile', '1.1.0'