httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ic...@apache.org
Subject svn commit: r1727081 - in /httpd/test/mod_h2/trunk: Makefile.am conf/httpd.conf conf/sites/test.example.org.conf mh2fuzz/h2c_conn.c test/test_fuzz.sh test/test_keepalive.sh
Date Wed, 27 Jan 2016 15:09:12 GMT
Author: icing
Date: Wed Jan 27 15:09:12 2016
New Revision: 1727081

URL: http://svn.apache.org/viewvc?rev=1727081&view=rev
Log:
test case update, fixing timeouts

Modified:
    httpd/test/mod_h2/trunk/Makefile.am
    httpd/test/mod_h2/trunk/conf/httpd.conf
    httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
    httpd/test/mod_h2/trunk/mh2fuzz/h2c_conn.c
    httpd/test/mod_h2/trunk/test/test_fuzz.sh
    httpd/test/mod_h2/trunk/test/test_keepalive.sh

Modified: httpd/test/mod_h2/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/Makefile.am?rev=1727081&r1=1727080&r2=1727081&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/Makefile.am (original)
+++ httpd/test/mod_h2/trunk/Makefile.am Wed Jan 27 15:09:12 2016
@@ -166,6 +166,12 @@ h2cload: \
 	$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 7 -m $(MAX_STREAMS) -c 8
 	$(H2LOAD) -i $(GEN)/load-h2c-urls-1.txt -n 200000 -t 8 -m $(MAX_STREAMS) -c 8
 
+h2tx: \
+		$(SERVER_DIR)/.test-setup \
+        $(GEN)/load-urls-1.txt
+	$(H2LOAD) -c 8 -t 8 -n 1000 -m 1 https://$(HTTPS_AUTH)/005.txt
+	$(H2LOAD) -c 8 -t 8 -n 1000 -m 1 http://$(HTTP_AUTH)/005.txt
+
 ################################################################################
 # Switch mpm modules
 #

Modified: httpd/test/mod_h2/trunk/conf/httpd.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/httpd.conf?rev=1727081&r1=1727080&r2=1727081&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/httpd.conf (original)
+++ httpd/test/mod_h2/trunk/conf/httpd.conf Wed Jan 27 15:09:12 2016
@@ -78,6 +78,8 @@ MaxKeepAliveRequests 0
 #Timeout 1
 #KeepAliveTimeout 5
 
+ThreadsPerChild 50
+
     #LogLevel core:debug
     #LogLevel ssl:debug
     

Modified: httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf?rev=1727081&r1=1727080&r2=1727081&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf (original)
+++ httpd/test/mod_h2/trunk/conf/sites/test.example.org.conf Wed Jan 27 15:09:12 2016
@@ -38,7 +38,7 @@
 
     <IfModule http2_module>
         H2Timeout 2
-        H2KeepAliveTimeout 10
+        KeepAliveTimeout 10
 
         H2Direct on
         H2AltSvc h2=test.example.org:12346

Modified: httpd/test/mod_h2/trunk/mh2fuzz/h2c_conn.c
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/mh2fuzz/h2c_conn.c?rev=1727081&r1=1727080&r2=1727081&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/mh2fuzz/h2c_conn.c (original)
+++ httpd/test/mod_h2/trunk/mh2fuzz/h2c_conn.c Wed Jan 27 15:09:12 2016
@@ -115,7 +115,6 @@ static apr_status_t tls_err(h2c_conn *c,
                 return APR_EOF;
             }
             return APR_EOF;
-            /* fall through */
         default:
             fprintf(stderr, "h2c_conn(%ld): tls error %s %d\n", c->id, msg, err);
             h2c_conn_close(c);
@@ -162,7 +161,7 @@ static apr_status_t tls_shutdown_read(h2
         
         ERR_clear_error();
         rv = SSL_shutdown(c->ssl);
-        if (rv >= 0) {
+        if (rv <= 0) {
             return tls_err(c, "tls shutdown", rv);
         }
     }

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=1727081&r1=1727080&r2=1727081&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_fuzz.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_fuzz.sh Wed Jan 27 15:09:12 2016
@@ -39,10 +39,10 @@ fuzz-close() {
     echo -n " * on $URL: "
 	for i in $*; do 
         echo -n "$i% "
-        $MH2FUZZ -q -t 4 -c 75 -m 10 -n 100000 -f random-close$i $URL/ 2>&1 |
+        $MH2FUZZ -q -t 4 -c 75 -m 10 -n 7500 -f random-close$i $URL/ 2>&1 |
         while read numbers xxx; do
             case "$numbers" in
-              */0/0/0/0)
+              */0/0/0/*)
                 ;;
               *"tls error"*)
                 ;;
@@ -61,10 +61,10 @@ fuzz-delay() {
     echo -n " * on $URL: "
 	for i in $*; do 
         echo -n "$i "
-        $MH2FUZZ -q -t 25 -c 25 -m 1 -n 50 -f random-delay$i $URL/ 2>&1 |
+        $MH2FUZZ -q -t 8 -c 8 -m 1 -n 32 -f random-delay$i $URL/ 2>&1 |
         while read numbers xxx; do
             case "$numbers" in
-              50/0/0/0/0)
+              */0/0/0/0)
                 ;;
               *)
                 echo "unexpected result: $numbers $xxx"

Modified: httpd/test/mod_h2/trunk/test/test_keepalive.sh
URL: http://svn.apache.org/viewvc/httpd/test/mod_h2/trunk/test/test_keepalive.sh?rev=1727081&r1=1727080&r2=1727081&view=diff
==============================================================================
--- httpd/test/mod_h2/trunk/test/test_keepalive.sh (original)
+++ httpd/test/mod_h2/trunk/test/test_keepalive.sh Wed Jan 27 15:09:12 2016
@@ -23,7 +23,7 @@ URL_PREFIX="$HTTP_URL"
 mh2fuzz_check_recv_frames index.html "timeout on $URL_PREFIX" -f submit-delay5500 <<EOF
 0: recv SETTINGS[length=6, stream=0]
 0: recv WINDOW_UPDATE[stream=0, inc=2147418112]
-0: recv GOAWAY[error=0, last_stream=0, reason='']
+0: recv GOAWAY[error=0, last_stream=0, reason='timeout']
 EOF
 
 
@@ -31,5 +31,5 @@ URL_PREFIX="$HTTPS_URL"
 mh2fuzz_check_recv_frames index.html "timeout on $URL_PREFIX" -f submit-delay5500 <<EOF
 0: recv SETTINGS[length=6, stream=0]
 0: recv WINDOW_UPDATE[stream=0, inc=2147418112]
-0: recv GOAWAY[error=0, last_stream=0, reason='']
+0: recv GOAWAY[error=0, last_stream=0, reason='timeout']
 EOF



Mime
View raw message