From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 29 Jun 2018 11:13:59 +0000 (+0100)
Subject: test suite: gpg-agent workaround: Kill unexpected leftover agents.
X-Git-Tag: archive/debian/5.5+exp5~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=395e13bd154a9d00ffb25cff3f45e3afa8222d13

test suite: gpg-agent workaround: Kill unexpected leftover agents.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index 78505974..bc809a72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dgit (5.5+exp5~) experimental; urgency=medium
 
   * test suite: gpg-agent workaround: Add more debugging output.
+  * test suite: gpg-agent workaround: Kill unexpected leftover agents.
 
  --
 
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'