From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nf PATCH] selftests: netfilter: Avoid hanging ipvs.sh
Date: Thu, 19 Sep 2024 12:43:56 +0200 [thread overview]
Message-ID: <20240919104356.20298-1-phil@nwl.cc> (raw)
If the client can't reach the server, the latter remains listening
forever. Kill it after 3s of waiting.
Fixes: 867d2190799ab ("selftests: netfilter: add ipvs test script")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
tools/testing/selftests/net/netfilter/ipvs.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/testing/selftests/net/netfilter/ipvs.sh b/tools/testing/selftests/net/netfilter/ipvs.sh
index 4ceee9fb3949..59d7aecbd887 100755
--- a/tools/testing/selftests/net/netfilter/ipvs.sh
+++ b/tools/testing/selftests/net/netfilter/ipvs.sh
@@ -107,6 +107,10 @@ client_connect() {
}
verify_data() {
+ waitpid -t 3 "${server_pid}"
+ if [ $? -eq 3 ]; then
+ kill "${server_pid}"
+ fi
wait "${server_pid}"
cmp "$infile" "$outfile" 2>/dev/null
}
--
2.43.0
next reply other threads:[~2024-09-19 10:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-19 10:43 Phil Sutter [this message]
2024-09-19 12:02 ` [nf PATCH] selftests: netfilter: Avoid hanging ipvs.sh Pablo Neira Ayuso
2024-09-19 12:08 ` Pablo Neira Ayuso
2024-09-19 12:38 ` Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240919104356.20298-1-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).