Merge pull request #20536 from edsantiago/pasta_timeout_tweaks

systests: pasta: avoid hangs
2023-10-31 11:58:57 +00:00 · 2023-10-31 11:58:57 +00:00 · 4eb02346d5
parent 735e243319 6b94c8fd31
commit 4eb02346d5
1 changed files with 2 additions and 1 deletions
--- a/test/system/505-networking-pasta.bats
+++ b/test/system/505-networking-pasta.bats
@ -240,7 +240,8 @@ function pasta_test_do() {
        local connect="${proto_upper}${ip_ver}:[${addr}]:${one_port}"
        [ "${proto}" = "udp" ] && connect="${connect},shut-null"

-        (while sleep ${delay} && ! socat -u "OPEN:${XFER_FILE}" "${connect}"; do :
+        local retries=10
+        (while sleep ${delay} && test $((retries--)) -gt 0 && ! timeout --foreground -v --kill=5 90 socat -u "OPEN:${XFER_FILE}" "${connect}"; do :
         done) &
    done