From: anton <anton@openbsd.org>
Date: Tue, 5 Mar 2024 07:01:40 +0000 (+0000)
Subject: Make ftpd tests less flaky by ensuring the server has terminated before
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=20110d46fc7fb1ec548b2feceab469c370307257;p=openbsd

Make ftpd tests less flaky by ensuring the server has terminated before
starting a new one.
---

diff --git a/regress/libexec/ftpd/Makefile b/regress/libexec/ftpd/Makefile
index fe6bfdc625b..35ccfc7484e 100644
--- a/regress/libexec/ftpd/Makefile
+++ b/regress/libexec/ftpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 2021/05/09 14:26:45 jan Exp $
+#	$OpenBSD: Makefile,v 1.12 2024/03/05 07:01:40 anton Exp $
 
 .PHONY: setup-ftpd
 
@@ -41,6 +41,7 @@ regress:
 setup-ftpd:
 	${SUDO} pkill tcpserver || true
 	${SUDO} pkill ftpd || true
+	nc 127.0.0.1 21 >/dev/null 2>&1 || true
 	# start ftpd
 	${SUDO} ${TCPSERVER} 127.0.0.1 21 ${KTRACE} ${FTPD} -A & \
 	    timeout=$$(($$(date +%s) + 5)); \