test suite: gpg-agent workaround: Add more debugging output.

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

diff --git a/debian/changelog b/debian/changelog
index 41a6710b01baa35f389016df03e19a5ad309ca24..78505974a4bec2323c6fb5331bb10ca91913f72d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dgit (5.5+exp5~) experimental; urgency=medium
+
+  * test suite: gpg-agent workaround: Add more debugging output.
+
+ --
+
 dgit (5.5+exp4) experimental; urgency=medium
 
   * test suite: Add bc to appropriate test Depends.

diff --git a/tests/tstunt/gpg-withagent b/tests/tstunt/gpg-withagent
index 4cb5d4e619ee75d81eb1351883d2f21ad9a010c5..d7fe793e7cdf36b9216d94343a043d0a328ecb64 100755 (executable)
--- a/tests/tstunt/gpg-withagent
+++ b/tests/tstunt/gpg-withagent
@@ -1,9 +1,18 @@
 #!/bin/sh
 set -ex
 
+d () {
+       date --iso-8601=ns >&2
+       ps -ef | grep gpg-agent >&2
+}
+
+d
+
 retry_until_ok () {
        sleeptime=0
+       d
        while ! "$@"; do
+               d
                case $sleeptime in
                ??.*)
                        echo >&2 "$0: GPG AGENT STARTP $@ TIMED OUT"
@@ -29,12 +38,16 @@ retry_until_ok agent_is_running
 
 echo >&2 'GPG-WITHAGENT... RUNNING'
 
+d
+
 set +e
 $DGIT_TEST_REAL_GPG                                    \
        --agent-program=$DGIT_STUNT_AGENT "$@"
 rc=$?
 set -e
 
+d
+
 echo >&2 'GPG-WITHAGENT... STOPPING'
 
 kill_agent_not_running () {
@@ -48,4 +61,6 @@ retry_until_ok kill_agent_not_running
 
 echo >&2 'GPG-WITHAGENT... DONE'
 
+d
+
 exit $rc