X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftstunt%2Fgpg-withagent;fp=tests%2Ftstunt%2Fgpg-withagent;h=4318cce041d995003c2b857ab75f78a1995bbe30;hb=395e13bd154a9d00ffb25cff3f45e3afa8222d13;hp=d7fe793e7cdf36b9216d94343a043d0a328ecb64;hpb=7d0d834d7b41b5f3cafffc37b9a9d94966c68e0f;p=dgit.git

diff --git a/tests/tstunt/gpg-withagent b/tests/tstunt/gpg-withagent
index d7fe793e..4318cce0 100755
--- a/tests/tstunt/gpg-withagent
+++ b/tests/tstunt/gpg-withagent
@@ -24,7 +24,16 @@ retry_until_ok () {
 	done
 }
 
-echo >&2 'GPG-WITHAGENT...'
+kill_agent_not_running () {
+	LC_MESSAGES=C gpg-connect-agent --no-autostart </dev/null \
+		KILLAGENT /bye 2>&1 \
+	| tee -a /dev/stderr \
+	| grep 'no gpg-agent running' >&2
+}
+
+echo >&2 'GPG-WITHAGENT... PRE-STOPPING'
+
+retry_until_ok kill_agent_not_running
 
 agent_is_running () {
 	gpg-connect-agent --no-autostart </dev/null \
@@ -50,13 +59,6 @@ d
 
 echo >&2 'GPG-WITHAGENT... STOPPING'
 
-kill_agent_not_running () {
-	LC_MESSAGES=C gpg-connect-agent --no-autostart </dev/null \
-		KILLAGENT /bye 2>&1 \
-	| tee -a /dev/stderr \
-	| grep 'no gpg-agent running' >&2
-}
-
 retry_until_ok kill_agent_not_running
 
 echo >&2 'GPG-WITHAGENT... DONE'