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 78505974a4bec2323c6fb5331bb10ca91913f72d..bc809a729bb8e88ebcb6dbcc637925609bbd10d2 100644 (file)
--- 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 d7fe793e7cdf36b9216d94343a043d0a328ecb64..4318cce041d995003c2b857ab75f78a1995bbe30 100755 (executable)
--- 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'