From 772a5da573a661df6421afa6398b9e4023e77ce4 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 9 Jun 2011 23:47:37 +0000 Subject: tests: more fixes for StreamResponseEpoll Oops. --- t/t0017-keepalive-timeout-zero.sh | 1 + t/t0101-rack-input-trailer.sh | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 't') diff --git a/t/t0017-keepalive-timeout-zero.sh b/t/t0017-keepalive-timeout-zero.sh index 0f81d20..b4085e8 100755 --- a/t/t0017-keepalive-timeout-zero.sh +++ b/t/t0017-keepalive-timeout-zero.sh @@ -1,5 +1,6 @@ #!/bin/sh . ./test-lib.sh +skip_models StreamResponseEpoll t_plan 6 "keepalive_timeout 0 tests for $model" t_begin "setup and start" && { diff --git a/t/t0101-rack-input-trailer.sh b/t/t0101-rack-input-trailer.sh index bf3eb1d..1dfae6a 100755 --- a/t/t0101-rack-input-trailer.sh +++ b/t/t0101-rack-input-trailer.sh @@ -29,7 +29,7 @@ t_begin "staggered trailer upload" && { } t_begin "HTTP response is OK" && { - fgrep 'HTTP/1.1 200 OK' $tmp + grep 'HTTP/1\.[01] 200 OK' $tmp } t_begin "upload small blob" && { @@ -42,7 +42,7 @@ t_begin "upload small blob" && { test xok = x"$(cat $ok)" } -t_begin "HTTP response is OK" && fgrep 'HTTP/1.1 200 OK' $tmp +t_begin "HTTP response is OK" && grep 'HTTP/1\.[01] 200 OK' $tmp t_begin "no errors in stderr log" && check_stderr t_begin "big blob request" && { @@ -55,7 +55,7 @@ t_begin "big blob request" && { test xok = x"$(cat $ok)" } -t_begin "HTTP response is OK" && fgrep 'HTTP/1.1 200 OK' $tmp +t_begin "HTTP response is OK" && grep 'HTTP/1\.[01] 200 OK' $tmp t_begin "no errors in stderr log" && check_stderr t_begin "staggered blob upload" && { @@ -76,9 +76,7 @@ t_begin "staggered blob upload" && { test xok = x"$(cat $ok)" } -t_begin "HTTP response is OK" && { - fgrep 'HTTP/1.1 200 OK' $tmp -} +t_begin "HTTP response is OK" && grep 'HTTP/1\.[01] 200 OK' $tmp t_begin "no errors in stderr log" && check_stderr -- cgit v1.2.3-24-ge0c7