Allow individual tests to override vegeta opts

Author: jsks

test/stress/stress.sh

@@ -9,8 +9,6 @@ if [[ -t 1 ]] && (( $terminfo[colors] >= 8 )); then
     colors
 fi
 
-which vegeta >/dev/null || error "Missing vegeta, unable to run stress tests"
-
 typeset -g VEGETA_OPTS VERBOSE DURATION
 
 # Output directories
@@ -24,6 +22,8 @@ source $STRESS_DIR/../utils.sh
 mkdir -p $TESTTMP $TESTROOT
 : >> $CONF
 
+which vegeta >/dev/null || error "Missing vegeta, unable to run stress tests"
+
 function help() {
 <<EOF
 Usage: stress.sh [OPTIONS] [file]
@@ -48,9 +48,9 @@ exit
 
 function attack() {
     echo "GET http://127.0.0.1:$PORT/" | \
-        vegeta attack -name=$1 "${=VEGETA_OPTS}" > $REPORT_DIR/$1.bin
+        vegeta attack -name=${@[-1]} "${=VEGETA_OPTS}" ${@[1,-2]} > $REPORT_DIR/${@[-1]}.bin
 
-    (( VERBOSE )) && vegeta report $REPORT_DIR/$1.bin
+    (( VERBOSE )) && vegeta report $REPORT_DIR/${@[-1]}.bin
 
     return 0
 }
@@ -87,7 +87,7 @@ done
 : ${DURATION:="5s"}
 : ${VERBOSE:=0}
 
-VEGETA_OPTS="-duration=$DURATION -http2=false -timeout=10s"
+VEGETA_OPTS="-duration=$DURATION -http2=false -timeout=10s -keepalive=false"
 
 # Preserve TESTROOT across tests
 root=$TESTROOT
@@ -109,5 +109,3 @@ for i in ${1:-$STRESS_DIR/stress_*.sh}; do
     print "$fg_bold[magenta]${i:t}$fg_no_bold[white]"
     source $i
 done
-
-vegeta plot $REPORT_DIR/*.bin > $HTML_DIR/full.html

test/stress/stress_directory.sh

@@ -12,14 +12,12 @@ HTTP_CACHE=0
 HTML_CACHE=0
 EOF
 
-stop_server
 TESTROOT=$root
-start_server
-heartbeat
+restart_server
 
 # Default directory listing
 describe "Default directory serving"
-attack defaults_dir
+attack default_directory
 
 # Cache
 <<EOF > $CONF
@@ -33,8 +31,8 @@ HTML_CACHE=1
 EOF
 reload_conf
 
-describe "Directory listing with cache"
-attack cache_dir
+describe "Directory serving with caching"
+attack cache_directory
 
 # Compress directory
 <<EOF > $CONF
@@ -57,8 +55,8 @@ source $SRC_DIR/modules/compress.sh
 EOF
 reload_conf
 
-describe "Directory listing compression"
-attack compress_dir
+describe "Directory serving with compression"
+attack compress_directory
 
 # Compress directory with cache
 <<EOF > $CONF
@@ -81,7 +79,7 @@ source $SRC_DIR/modules/compress.sh
 EOF
 reload_conf
 
-describe "Directory listing compression+cache"
-attack compress_cache_dir
+describe "Directory serving compression+cache"
+attack compress+cache_directory
 
-vegeta plot $REPORT_DIR/*_dir.bin > $HTML_DIR/directory_listing.html
+vegeta plot $REPORT_DIR/*_directory.bin > $HTML_DIR/directory_listing.html

test/stress/stress_file.sh

@@ -12,14 +12,11 @@ HTTP_CACHE=0
 HTML_CACHE=0
 EOF
 
-stop_server
 TESTROOT=$root/test.html
-start_server
-heartbeat
+restart_server
 
-# Default file listing
-describe "Default file serving"
-attack defaults_file
+describe "Default file serving with HTTP keep-alive"
+attack -keepalive=true default_keep-alive_file
 
 # Disable keep-alive
 <<EOF > $CONF
@@ -33,8 +30,8 @@ HTML_CACHE=0
 EOF
 reload_conf
 
-describe "Disabled keep-alive"
-attack no_keep-alive_file
+describe "Default file serving without HTTP keep-alive"
+attack default_no_keep-alive_file
 
 # Single file compress
 <<EOF > $CONF
@@ -80,7 +77,7 @@ EOF
 reload_conf
 
 describe "Single file compression+cache"
-attack compress_cache_file
+attack compress+cache_file
 
 # Finally
-vegeta plot $REPORT_DIR/*_file.bin > $HTML_DIR/file_listing.html
+vegeta plot $REPORT_DIR/*_file.bin > $HTML_DIR/file_serving.html

test/stress/stress_multiple.sh

@@ -2,70 +2,38 @@
 # Stress test concurrent connections. Will be sourced by `test.sh` #
 ####################################################################
 
-VEGETA_OPTS+=" -rate=500/1s -keepalive=false"
-
-<<EOF > $CONF
-MAX_CONN=1
-HTTP_KEEP_ALIVE=1
-HTTP_TIMEOUT=30
-HTTP_RECV_TIMEOUT=5
-HTTP_BODY_SIZE=16384
-HTTP_CACHE=0
-HTML_CACHE=0
-EOF
-
-stop_server
-TESTROOT=$root/test.html
-start_server
-heartbeat
-
-
-# Single connection
-describe "Multiple connections with MAX_CONN = 1"
-attack single_multiple
-
-vegeta plot $REPORT_DIR/single_multiple.bin > $HTML_DIR/single_multiple.html
-
 <<EOF > $CONF
 MAX_CONN=12
-HTTP_KEEP_ALIVE=1
+HTTP_KEEP_ALIVE=0
 HTTP_TIMEOUT=30
 HTTP_RECV_TIMEOUT=5
 HTTP_BODY_SIZE=16384
 HTTP_CACHE=0
 HTML_CACHE=0
 EOF
 
-# Clean testing env
-stop_server
-start_server
-heartbeat
+TESTROOT=$root/test.html
+restart_server
 
 # Default number connections
 describe "Multiple connections with MAX_CONN = 12"
-attack default_multiple
-
-vegeta plot $REPORT_DIR/default_multiple.bin > $HTML_DIR/default_multiple.html
+attack -rate="500/1s" default_max_conn
 
 <<EOF > $CONF
-MAX_CONN=48
-HTTP_KEEP_ALIVE=1
+MAX_CONN=30
+HTTP_KEEP_ALIVE=0
 HTTP_TIMEOUT=30
 HTTP_RECV_TIMEOUT=5
 HTTP_BODY_SIZE=16384
 HTTP_CACHE=0
 HTML_CACHE=0
 EOF
 
-stop_server
-start_server
-heartbeat
+restart_server
 
 # Increased number connections
 describe "Multiple connections with MAX_CONN = 30"
-attack max_multiple
-
-vegeta plot $REPORT_DIR/max_multiple.bin > $HTML_DIR/max_multiple.html
+attack -rate="500/1s" 30_max_conn
 
 # Finally
-vegeta plot $REPORT_DIR/*_multiple.bin > $HTML_DIR/multiple.html
+vegeta plot $REPORT_DIR/*_conn.bin > $HTML_DIR/max_conn.html