Merge pull request #20536 from edsantiago/pasta_timeout_tweaks
systests: pasta: avoid hangs
This commit is contained in:
commit
4eb02346d5
|
@ -240,7 +240,8 @@ function pasta_test_do() {
|
||||||
local connect="${proto_upper}${ip_ver}:[${addr}]:${one_port}"
|
local connect="${proto_upper}${ip_ver}:[${addr}]:${one_port}"
|
||||||
[ "${proto}" = "udp" ] && connect="${connect},shut-null"
|
[ "${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) &
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue