You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/03/14 13:23:00 UTC
svn commit: r1734930 - in /httpd/test/mod_h2/trunk/test: test_alt_host.sh
test_common.sh test_frames.sh test_fuzz.sh test_header.sh test_push.sh
Author: icing
Date: Mon Mar 14 12:22:59 2016
New Revision: 1734930
URL: http://svn.apache.org/viewvc?rev=1734930&view=rev
Log:
proper version check to make suite run against 2.4.18
Modified:
httpd/test/mod_h2/trunk/test/test_alt_host.sh
httpd/test/mod_h2/trunk/test/test_common.sh
httpd/test/mod_h2/trunk/test/test_frames.sh
httpd/test/mod_h2/trunk/test/test_fuzz.sh
httpd/test/mod_h2/trunk/test/test_header.sh
httpd/test/mod_h2/trunk/test/test_push.sh
Modified: httpd/test/mod_h2/trunk/test/test_alt_host.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_alt_host.sh?rev=1734930&r1=1734929&r2=1734930&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_alt_host.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_alt_host.sh Mon Mar 14 12:22:59 2016
@@ -68,8 +68,8 @@ curl_check_content hello.py "test2 host"
HTTPS=on<br/>
PROTOCOL=HTTP/2<br/>
SSL_PROTOCOL=${EXP_SSL_PROTOCOL}<br/>
-HTTP2=on<br/>
-H2PUSH=on<br/>
+HTTP2=${EXP_HTTP2}<br/>
+H2PUSH=${EXP_H2PUSH}<br/>
</body>
</html>
EOF
Modified: httpd/test/mod_h2/trunk/test/test_common.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_common.sh?rev=1734930&r1=1734929&r2=1734930&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_common.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_common.sh Mon Mar 14 12:22:59 2016
@@ -74,42 +74,55 @@ fail() {
exit 1
}
+if min_version 2.4.19; then
+ case "$URL_PREFIX" in
+ */proxy|*/rewrite)
+ EXP_H2PUSH=""
+ EXP_H1_HTTP2=""
+ EXP_H2_H2PUSH=""
+ ;;
+ */h2proxy)
+ EXP_HTTP2="on"
+ EXP_H2PUSH="off"
+ EXP_H1_HTTP2="${EXP_HTTP2}"
+ EXP_H1_H2PUSH="${EXP_H2PUSH}"
+ ;;
+ */h2cproxy)
+ EXP_HTTP2="on"
+ EXP_H2PUSH="off"
+ EXP_H1_HTTP2="${EXP_HTTP2}"
+ EXP_H1_H2PUSH="${EXP_H2PUSH}"
+ ;;
+ *)
+ EXP_HTTP2="on"
+ EXP_H2PUSH="on"
+ EXP_H1_HTTP2=""
+ EXP_H2_H2PUSH=""
+ ;;
+ esac
+fi
+
case "$URL_PREFIX" in
*/proxy|*/rewrite)
EXP_PROTOCOL="HTTP/1.1"
- EXP_HTTP2=""
- EXP_H2PUSH=""
- EXP_H1_HTTP2=""
- EXP_H2_H2PUSH=""
;;
*/h2proxy)
EXP_HTTPS="on"
EXP_PROTOCOL="HTTP/2"
EXP_H1_PROTOCOL="${EXP_PROTOCOL}"
EXP_SSL_PROTOCOL="TLSv1.2"
- EXP_HTTP2="on"
- EXP_H2PUSH="off"
- EXP_H1_HTTP2="${EXP_HTTP2}"
- EXP_H1_H2PUSH="${EXP_H2PUSH}"
;;
*/h2cproxy)
EXP_HTTPS=""
EXP_SSL_PROTOCOL=""
EXP_PROTOCOL="HTTP/2"
EXP_H1_PROTOCOL="${EXP_PROTOCOL}"
- EXP_HTTP2="on"
- EXP_H2PUSH="off"
- EXP_H1_HTTP2="${EXP_HTTP2}"
- EXP_H1_H2PUSH="${EXP_H2PUSH}"
;;
*)
- EXP_HTTP2="on"
- EXP_H2PUSH="on"
- EXP_H1_HTTP2=""
- EXP_H2_H2PUSH=""
;;
esac
+
case "$OPT_DIRECT" in
"direct")
ARG_UPGRADE=""
Modified: httpd/test/mod_h2/trunk/test/test_frames.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_frames.sh?rev=1734930&r1=1734929&r2=1734930&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_frames.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_frames.sh Mon Mar 14 12:22:59 2016
@@ -48,6 +48,8 @@ mh2fuzz_check_frames not-there "frames G
0/0/1/0/0 (2/3/4/5/0xx)
EOF
+if min_version 2.4.19; then
+
URL_PREFIX="$HTTPS_URL"
mh2fuzz_check_frames index.html "frames GET $URL_PREFIX" -f submit-delay100 <<EOF
ALPN: selected h2
@@ -80,3 +82,4 @@ ALPN: selected h2
EOF
+fi
\ No newline at end of file
Modified: httpd/test/mod_h2/trunk/test/test_fuzz.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_fuzz.sh?rev=1734930&r1=1734929&r2=1734930&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_fuzz.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_fuzz.sh Mon Mar 14 12:22:59 2016
@@ -34,6 +34,8 @@ HTTPS_AUTH_SER=https://$HOST_NAME_SER:$H
MH2FUZZ=mh2fuzz/mh2fuzz
+source $(dirname $0)/test_common.sh
+
fuzz-close() {
URL="$1"; shift;
echo -n " * on $URL: "
@@ -77,7 +79,10 @@ fuzz-delay() {
}
echo "test frames sent/recv on GETs"
-$SHELL "$TEST_DIR"/test_frames.sh $HTTP_AUTH $HTTPS_AUTH &&
+$SHELL "$TEST_DIR"/test_frames.sh $HTTP_AUTH $HTTPS_AUTH ||Â fail
+
+if min_version 2.4.19; then
+
echo "test unexp. connection close with likelihood xx%" &&
fuzz-close $HTTP_AUTH 1 2 5 10 25 &&
fuzz-close $HTTPS_AUTH 1 2 5 10 25 &&
@@ -93,3 +98,5 @@ echo "test random write delays for 0-n s
fuzz-delay $HTTP_AUTH 1 2 4 &&
fuzz-delay $HTTPS_AUTH 1 4 8 &&
:
+
+fi
\ No newline at end of file
Modified: httpd/test/mod_h2/trunk/test/test_header.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_header.sh?rev=1734930&r1=1734929&r2=1734930&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_header.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_header.sh Mon Mar 14 12:22:59 2016
@@ -24,6 +24,10 @@ echo "test headers: $@"
URL_PREFIX="$1"
+if min_version 2.4.19; then
+
mh2fuzz_check_results / "request with Host, but no :authority..." -f host-header <<EOF
1/0/0/0/0 (2/3/4/5/0xx)
EOF
+
+fi
\ No newline at end of file
Modified: httpd/test/mod_h2/trunk/test/test_push.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_push.sh?rev=1734930&r1=1734929&r2=1734930&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_push.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_push.sh Mon Mar 14 12:22:59 2016
@@ -48,6 +48,7 @@ EOF
006-push4.html
EOF
+if min_version 2.4.19; then
# push-policies (https://tools.ietf.org/html/draft-ruellan-http-accept-push-policy-00)
# a. no pushes desired
nghttp_check_fcontent 006-push.html "policy: none" -H 'accept-push-policy: none' <<EOF
@@ -74,8 +75,6 @@ EOF
006/006.css
EOF
- if min_version 2.4.19; then
-
# link header with double rel values
nghttp_check_fcontent 006-push5.html "get 006-push5" <<EOF
006-push5.html