X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fmirror;h=95c1cdbd139f6cb39d4260ad5a7a15079cb06e2e;hb=441cf15ffbafea7aa6be4cc04bb0085c8d79063e;hp=6f6300e298456e026a8fc5f16c75b4e3bb77a5db;hpb=1647f63f87eb287027d685d22c6a798aa775ebd1;p=dgit.git

diff --git a/tests/tests/mirror b/tests/tests/mirror
index 6f6300e2..95c1cdbd 100755
--- a/tests/tests/mirror
+++ b/tests/tests/mirror
@@ -3,6 +3,8 @@ set -e
 . tests/lib
 . $troot/lib-mirror
 
+t-dependencies rsync
+
 t-drs
 
 : ---- "basic test" ----
@@ -30,8 +32,6 @@ set -ex
 cat >&2 $sentinel
 shift # eat HOST
 sh -c "\$*"
-: ${sentinel}2
-date >${sentinel}2
 END
 chmod +x $tmp/stunt-ssh
 
@@ -53,8 +53,8 @@ t-check-mirrored
 
 : ----- "stall timeout test" -----
 
-rm -f $sentinel ${sentinel}2
-mkfifo $sentinel ${sentinel}2
+rm -f $sentinel
+mkfifo $sentinel
 
 t-mirror-set hooktimeout=5
 
@@ -65,7 +65,15 @@ t-check-not-mirrored
 
 exec 3<>$sentinel
 exec 3>&-
-cat ${sentinel}2
+
+attempts=100
+while [ -f $queuedir/$p.lock ]; do
+	if [ $attempts = 0 ]; then \
+		fail "timed out waiting for lock to go away"
+	fi
+	attempts=$(( $attempts - 1 ))
+	sleep 0.1
+done
 
 t-check-mirrored