test: Update tests to use new container provisioning

jajik · jajik · commit d005ca1949a5 · 2025-11-11T10:26:43.000+01:00
Shift tomcat ports where conflicts might lead to random test failures

Code and format clean ups
diff --git a/test/MODCLUSTER-640/testit.sh b/test/MODCLUSTER-640/testit.sh
@@ -10,7 +10,9 @@ httpd_remove
 rm -f nohup.out
 
 MPC_CONF=${MPC_CONF:-MODCLUSTER-640/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-640 httpd_start
+MPC_NAME=MODCLUSTER-640
+
+httpd_start
 
 # wait until httpd is started
 httpd_wait_until_ready  || exit 1
diff --git a/test/MODCLUSTER-734/testit.sh b/test/MODCLUSTER-734/testit.sh
@@ -10,7 +10,9 @@ httpd_remove
 rm -f nohup.out
 
 MPC_CONF=${MPC_CONF:-MODCLUSTER-734/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-734 httpd_start
+MPC_NAME=MODCLUSTER-734
+
+httpd_start
 
 # wait until httpd is started
 httpd_wait_until_ready || exit 1
@@ -29,7 +31,7 @@ docker cp MODCLUSTER-734/ROOT_OK tomcat2:/usr/local/tomcat/webapps/ROOT
 
 # after a while the health check will get the Under maintenance status.jsp
 # and mark the node not OK.
-sleep 15
+sleep 20
 
 curl -s -m 20 http://localhost:8090/mod_cluster_manager | grep "Status: NOTOK"
 if [ $? -eq 0 ]; then
diff --git a/test/MODCLUSTER-736/testit.sh b/test/MODCLUSTER-736/testit.sh
@@ -5,7 +5,12 @@
 httpd_remove
 tomcat_all_remove
 
-MPC_NAME=MODCLUSTER-736 httpd_start
+MPC_NAME=MODCLUSTER-736
+# We must shift tomcat ports so that they do not collide with proxy
+PORT=9000
+SHUTDOWN_PORT=7005
+
+httpd_start
 
 # Start a bunch ($1, or 6 if no argument is given) of tomcat
 # containers, then test them and stop them
@@ -75,15 +80,8 @@ runtomcatbatch() {
 singlecycle() {
     echo "singlecycle: Testing tomcat$1"
     R=$1
-    if [ "$2" = "useran" ]; then
-        R=$(expr 1 + $RANDOM % 10 + 10)
-        R=$(expr $R + 2)
-        # TODO
-        tomcat_start $1 127.0.0.$R || exit 1
-    else
-        R=0
-        tomcat_start $1 127.0.0.$R || exit 1
-    fi
+    tomcat_start $1 || exit 1
+
     # Wait for it to start
     echo "Testing(0) tomcat$1 waiting..."
     i=0
@@ -106,7 +104,8 @@ singlecycle() {
     i=0
     while true
     do
-        curl -s -m 20 http://localhost:8090/mod_cluster_manager | grep /tomcat$1 > /dev/null
+        # we have to grep the beginning slash but also a comma at the end, otherwise hostname might be matched
+        curl -s -m 20 http://localhost:8090/mod_cluster_manager | grep "/tomcat$1," > /dev/null
         if [ $? -eq 0 ]; then
             break
         fi
@@ -123,7 +122,7 @@ singlecycle() {
     tomcat_test_app $1 || exit 1
     tomcat_run_ab $1 || exit 1
     echo "Testing(3) tomcat$1"
-    tomcat_shutdown $1 127.0.0.$R || exit 1
+    tomcat_shutdown $1 || exit 1
     while true
     do
         curl -s -m 20 http://localhost:8090/mod_cluster_manager | grep Node | grep tomcat$1 > /dev/null
@@ -184,16 +183,11 @@ forevertomcat() {
 
 # Start and stop successively (one after another) $1 tomcats
 cyclestomcats() {
-    i=1
-    while true
-    do
-        i=$(expr $i + 1)
-        if [ $i -gt $1 ]; then
-            echo "Looks OK, Done!"
-            break
-        fi
-        singlecycle $i useran || exit 1
+    for i in $(seq 1 $1); do
+        echo -n "$i/$1: "
+        singlecycle $i || exit 1
     done
+    echo "Looks OK, Done!"
 }
 
 # run test for https://issues.redhat.com/browse/MODCLUSTER-736
diff --git a/test/MODCLUSTER-755/testit.sh b/test/MODCLUSTER-755/testit.sh
@@ -12,7 +12,9 @@ httpd_remove
 tomcat_all_remove
 
 MPC_CONF=${MPC_CONF:-MODCLUSTER-755/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-755 httpd_start
+MPC_NAME=MODCLUSTER-755
+
+httpd_start
 
 httpd_wait_until_ready
 
diff --git a/test/MODCLUSTER-785/testit.sh b/test/MODCLUSTER-785/testit.sh
@@ -11,8 +11,10 @@ httpd_remove
 rm -f nohup.out
 
 MPC_CONF=${MPC_CONF:-MODCLUSTER-785/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-785 httpd_start
+MPC_NAME=MODCLUSTER-785
+PORT=9000
 
+httpd_start
 
 # start tomcat1 on 8080
 tomcat_start 1
@@ -32,12 +34,12 @@ if [ $? -ne 0 ]; then
 fi
 
 # Stop abruptly
-tomcat_remove 1
+tomcat_kill 1
 
 # it return 503
 # make sure we use enough workers
-ab -c 10 -n100 http://localhost:8090/app/
-http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8090/app/)
+ab -c 10 -n 100 http://localhost:8090/app/status.jsp
+http_code=$(curl -s -m 20 -o /dev/null -w "%{http_code}" http://localhost:8090/app/status.jsp)
 if [ ${http_code} != 503 ]; then
   echo "MODCLUSTER-785 Failed! not 503 but ${http_code}"
   exit 1
@@ -46,7 +48,8 @@ fi
 sleep 15
 
 # start tomcat1 on 8080
-tomcat_start 1
+tomcat_remove 1
+tomcat_start  1
 
 # wait until tomcat1 is in mod_proxy_cluster tables
 tomcat_wait_for_n_nodes 1
diff --git a/test/MODCLUSTER-794/testit.sh b/test/MODCLUSTER-794/testit.sh
@@ -6,10 +6,14 @@
 tomcat_all_remove
 httpd_remove
 
+# due to conflict with proxy's 8090 port we shift tomcats
+PORT=9000
 MPC_CONF=${MPC_CONF:-MODCLUSTER-794/mod_proxy_cluster.conf}
-MPC_NAME=MODCLUSTER-794 httpd_start
+MPC_NAME=MODCLUSTER-794
+httpd_start
 
-for i in {1..20}; do
+
+for i in $(seq 1 20); do
     tomcat_start $i
 done
 
@@ -26,5 +30,7 @@ for i in $(seq 1 10); do
     sleep 5
 done
 
+tomcat_wait_for_n_nodes 20
+
 tomcat_all_remove
 
diff --git a/test/hangingtests.sh b/test/hangingtests.sh
@@ -5,39 +5,36 @@
 httpd_remove
 tomcat_all_remove
 
+tomcat_jdbsuspend_prepare() {
+    # Create files we need
+    docker exec -i tomcat$1 sh -c 'echo cont > continue.txt; echo exit >> continue.txt'
+    docker exec -i tomcat$1 sh -c 'echo suspend all > hang.txt; echo exit >> hang.txt'
+    docker exec -i tomcat$1 sh -c 'jdb -attach 6660 < continue.txt'
+}
 
 # This should suspend the tomcat for ~ 1000 seconds ~ causing it gets removed afterwhile.
-jdbsuspend() {
-    rm -f /tmp/testpipein
-    mkfifo /tmp/testpipein
-    rm -f /tmp/testpipeout
-    mkfifo /tmp/testpipeout
-    sleep 1000 > /tmp/testpipein &
-    jdb -attach 6660 < /tmp/testpipein > /tmp/testpipeout &
-    echo "suspend" > /tmp/testpipein
-    cat < /tmp/testpipeout &
+tomcat_jdbsuspend_start() {
+    # suspend
+    docker exec -i tomcat$1 sh -c 'rm -f /tmp/testpipein'
+    docker exec -i tomcat$1 sh -c 'mkfifo /tmp/testpipein'
+    docker exec -i tomcat$1 sh -c 'rm -f /tmp/testpipeout'
+    docker exec -i tomcat$1 sh -c 'mkfifo /tmp/testpipeout'
+    docker exec -i tomcat$1 sh -c 'sleep 1000 > /tmp/testpipein &'
+    docker exec -i tomcat$1 sh -c 'jdb -attach 6660 < /tmp/testpipein > /tmp/testpipeout &'
+    docker exec -i tomcat$1 sh -c 'echo "suspend" > /tmp/testpipein'
+    docker exec -i tomcat$1 sh -c 'cat < /tmp/testpipeout &'
 }
 
-jdbexit() {
-    cat > /tmp/testpipeout &
-    echo "exit" > /tmp/testpipein
+tomcat_jdbsuspend_exit() {
+    docker exec -i tomcat$1 sh -c 'cat > /tmp/testpipeout &'
+    docker exec -i tomcat$1 sh -c 'echo "exit" > /tmp/testpipein'
 }
 
 ####################################
 ###    S T A R T    T E S T S    ###
 ####################################
 httpd_start
 
-# Create files we need
-cat << EOF > continue.txt
-cont
-exit
-EOF
-cat << EOF > hang.txt
-suspend all
-exit
-EOF
-
 # Check that hanging tomcat will be removed
 echo "hanging a tomcat checking it is removed after a while no requests"
 tomcat_start_two
@@ -46,58 +43,59 @@ tomcat_wait_for_n_nodes 2 || exit 1
 # curlloop.sh checks for http://localhost:8090/testapp/test.jsp
 docker cp testapp tomcat1:/usr/local/tomcat/webapps
 docker cp testapp tomcat2:/usr/local/tomcat/webapps
-
 docker cp setenv.sh tomcat1:/usr/local/tomcat/bin
+
 docker commit tomcat1 ${IMG}-debug
 tomcat_remove 1
 tomcat_wait_for_n_nodes 1
 # Start the node.
 IMG=${IMG}-debug tomcat_start 1
 sleep 10
-docker exec tomcat1 jdb -attach 6660 < continue.txt
+tomcat_jdbsuspend_prepare 1
 tomcat_wait_for_n_nodes 2 || exit 1
 echo "2 tomcat started"
 # Hang the node,
 # jdb and a pipe to hang the tomcat.
-jdbsuspend
+tomcat_jdbsuspend_start 1
 tomcat_wait_for_n_nodes 1 || exit 1
 echo "1 tomcat hanging and gone"
-jdbexit
+tomcat_jdbsuspend_exit 1
 # The tomcat is comming up again
 tomcat_wait_for_n_nodes 2 || exit 1
 echo "the tomcat is back"
 
 # Same test with requests, make them in a loop
 echo "hanging tomcat removed after a while with requests"
 sh curlloop.sh 200 000 &
-jdbsuspend
+tomcat_jdbsuspend_start 1
 tomcat_wait_for_n_nodes 1 || exit 1
 ps -ef | grep curlloop | grep -v grep
 if [ $? -ne 0 ]; then
     echo "curlloop.sh FAILED!"
     exit 1
 fi
 ps -ef | grep curlloop | grep -v grep | awk ' { print $2 } ' | xargs kill
-jdbexit
+tomcat_jdbsuspend_exit 1
 # The tomcat is comming up again
 tomcat_wait_for_n_nodes 2 || exit 1
 
 # Same test with requets but stop the other tomcat
 echo "single hanging tomcat removed after a while with requests"
-tomcat_remove 2
+# kill because we want to keep it in the DNS records
+tomcat_kill 2
 tomcat_wait_for_n_nodes 1 || exit 1
-jdbsuspend
+tomcat_jdbsuspend_start 1
 sleep 10
 sh curlloop.sh 000 404 503 &
-tomcat_wait_for_n_nodes 0  || exit 1
+tomcat_wait_for_n_nodes 0 || exit 1
 ps -ef | grep curlloop | grep -v grep
 if [ $? -ne 0 ]; then
     echo "curlloop.sh FAILED!"
     exit 1
 fi
 ps -ef | grep curlloop | grep -v grep | awk ' { print $2 } ' | xargs kill
-jdbexit
-# The tomcat is comming up again
+tomcat_jdbsuspend_exit 1
+# The tomcat is coming up again
 tomcat_wait_for_n_nodes 1 || exit 1
 
 # Cleanup at the end
diff --git a/test/maintests.sh b/test/maintests.sh
@@ -89,8 +89,7 @@ echotestlabel "sticky: stopping one node and doing requests..."
 NODE=$(echo ${NEWCO} | awk -F = '{ print $2 }' | awk -F . '{ print $2 }')
 echo $NODE
 PORT=$(curl http://localhost:8090/mod_cluster_manager -m 20 | grep Node | grep $NODE | sed 's:)::' | awk -F : '{ print $3 } ')
-NAME=$(expr ${PORT} - 8080 + 1)
-echo "Will stop tomcat$NAME corresponding to ${NODE} and cookie: ${NEWCO}"
+NUMBER=$(expr ${PORT} - 8080 + 1)
 CODE="200"
 i=0
 while [ "$CODE" == "200" ]
@@ -102,8 +101,9 @@ do
   CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --cookie "${NEWCO}" http://localhost:8090/testapp/test.jsp)
   if [ $i -eq 0 ]; then
     # stop the tomcat
-    echo "tomcat${NAME} being stopped"
-    tomcat_remove $NAME
+    echo "tomcat${NUMBER} being stopped"
+    # We're going to kill instead of removal because kill only tomcat proc (keeps the container in DNS)
+    tomcat_kill $NUMBER
   fi
   i=$(expr $i + 1)
 done
@@ -114,7 +114,8 @@ if [ ${CODE} != "200" ]; then
 fi
 
 # Restart the tomcat
-tomcat_start ${NAME}
+tomcat_remove ${NUMBER}
+tomcat_start ${NUMBER}
 tomcat_wait_for_n_nodes 2
 
 # Test a keepalived connection finds the 2 webapps on each tomcat
@@ -139,36 +140,36 @@ docker commit tomcat2 ${IMG}-temporary
 tomcat_remove 2
 tomcat_wait_for_n_nodes 1
 # Start the node.
-IMG=${IMG}-temporary tomcat_start 2 &
+IMG=${IMG}-temporary tomcat_start 2
 tomcat_wait_for_n_nodes 2  || exit 1
-# Basically curl --header "Host: example.com" http://127.0.0.1:8090/test/test.jsp gives 200
+# Basically curl --header "Host: example.com" http://localhost:8090/test/test.jsp gives 200
 # in fact the headers are:
-# X-Forwarded-For: 127.0.0.1
+# X-Forwarded-For: localhost
 # X-Forwarded-Host: example.com
 # X-Forwarded-Server: fe80::faf4:935b:9dda:2adf
 # therefore don't forget ProxyPreserveHost On (otherwise UseAlias On failed...)
 #
-CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --header "Host: example.com" http://127.0.0.1:8090/test/test.jsp)
+CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --header "Host: example.com" http://localhost:8090/test/test.jsp)
 if [ ${CODE} != "200" ]; then
-  echo "Failed can't rearch webapp at example.com: ${CODE}"
+  echo "Failed can't reach webapp at example.com: ${CODE}"
   exit 1
 fi
-# Basically curl --header "Host: localhost" http://127.0.0.1:8090/test/test.jsp gives 400
-CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --header "Host: localhost" http://127.0.0.1:8090/test/test.jsp)
+# Basically curl --header "Host: localhost" http://localhost:8090/test/test.jsp gives 400
+CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --header "Host: localhost" http://localhost:8090/test/test.jsp)
 if [ ${CODE} != "404" ]; then
-  echo "Failed should NOT rearch webapp at localhost: ${CODE}"
+  echo "Failed should NOT reach webapp at localhost: ${CODE}"
   exit 1
 fi
-# Same using localhost/testapp2 and curl --header "Host: localhost" http://127.0.0.1:8090/testapp2/test.jsp
-CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --header "Host: localhost" http://127.0.0.1:8090/testapp2/test.jsp)
+# Same using localhost/testapp2 and curl --header "Host: localhost" http://localhost:8090/testapp2/test.jsp
+CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --header "Host: localhost" http://localhost:8090/testapp2/test.jsp)
 if [ ${CODE} != "200" ]; then
-  echo "Failed can't rearch webapp at localhost: ${CODE}"
+  echo "Failed can't reach webapp at localhost: ${CODE}"
   exit 1
 fi
-# Basically curl --header "Host: example.com" http://127.0.0.1:8090/testapp2/test.jsp gives 400
-CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --header "Host: example.com" http://127.0.0.1:8090/testapp2/test.jsp)
+# Basically curl --header "Host: example.com" http://localhost:8090/testapp2/test.jsp gives 400
+CODE=$(curl -s -o /dev/null -m 20 -w "%{http_code}" --header "Host: example.com" http://localhost:8090/testapp2/test.jsp)
 if [ ${CODE} != "404" ]; then
-  echo "Failed should NOT rearch webapp at localhost: ${CODE}"
+  echo "Failed should NOT reach webapp at localhost: ${CODE}"
   exit 1
 fi
 
diff --git a/test/websocket/basic.sh b/test/websocket/basic.sh
