2 files changed, 85 insertions, 1 deletions
diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
index 679a6b8..4214b4a 100755
--- a/tests/tstunt/gpg
+++ b/tests/tstunt/gpg
@@ -3,4 +3,20 @@ set -e
 
 exec \
 with-lock-ex -w "$DGIT_TEST_GNUPG_GLOBAL_LOCK" \
-	$tmp "$DGIT_TEST_TROOT"/tstunt/gpg-locked "$@"
+	sh -c '
+		"$@" 9>&2 2>>"$DGIT_TEST_GNUPG_LOG"
+		rc=$?
+		if [ $rc = 0 ]; then exit 0; fi
+		if [ "x$DGIT_TEST_BYHAND" != x ]; then
+			echo >&2 "BYHAND, not dumping $DGIT_TEST_GNUPG_LOG"
+		else
+			echo >&2 "########################################"
+			echo >&2 "$DGIT_TEST_GNUPG_LOG"
+			sed '\''s/^/\[gnupg-workarounds] /'\'' >&2 \
+				"$DGIT_TEST_GNUPG_LOG"
+			echo >&2 "end of $DGIT_TEST_GNUPG_LOG"
+			echo >&2 "########################################"
+		fi
+		exit $rc
+	' x \
+	"$DGIT_TEST_TROOT"/tstunt/gpg-withagent "$@"
diff --git a/tests/tstunt/gpg-withagent b/tests/tstunt/gpg-withagent
new file mode 100755
index 0000000..b7b8bfd
--- /dev/null
+++ b/tests/tstunt/gpg-withagent
@@ -0,0 +1,68 @@
+#!/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"
+			exit 127
+			;;
+		esac
+		sleep $sleeptime
+		sleeptime=$(echo "($sleeptime + 0.001) * 2" | bc -l)
+	done
+}
+
+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 \
+		'/echo dgit-gpg-agent-ok' /bye 2>&1 \
+	| grep dgit-gpg-agent-ok >&2
+}
+
+
+$DGIT_STUNT_AGENT --daemon </dev/null >&2
+retry_until_ok agent_is_running
+
+echo >&2 'GPG-WITHAGENT... RUNNING'
+
+d
+
+set +e
+$DGIT_TEST_REAL_GPG					\
+	--agent-program=$DGIT_STUNT_AGENT "$@" 2>&9
+rc=$?
+set -e
+
+d
+
+echo >&2 'GPG-WITHAGENT... STOPPING'
+
+retry_until_ok kill_agent_not_running
+
+echo >&2 'GPG-WITHAGENT... DONE'
+
+d
+
+exit $rc