From 127632098e58021e467fb56fa36466785f2cbe55 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Jan 2017 21:04:31 +0000
Subject: [PATCH 1/1] Arrange to pass --debug-quick-random to gpg-agent.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog       |  1 +
 tests/setup/gnupg      | 16 +++++++++++++++-
 tests/tstunt/gpg       |  6 ++++++
 tests/tstunt/gpg-agent |  6 ++++++
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100755 tests/tstunt/gpg
 create mode 100755 tests/tstunt/gpg-agent

diff --git a/debian/changelog b/debian/changelog
index 53c4eb04..30c0bf3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dgit (2.17~) unstable; urgency=medium
   Test suite:
   * Internal improvements.
   * badcommit-rewrite: Fix operation using installed version of fixup.
+  * Arrange to pass --debug-quick-random to gpg-agent.
 
  --
 
diff --git a/tests/setup/gnupg b/tests/setup/gnupg
index d23ecfa3..6100bf57 100755
--- a/tests/setup/gnupg
+++ b/tests/setup/gnupg
@@ -8,8 +8,22 @@ chmod go-rw $tmp/gnupg/*
 
 export GNUPGHOME=$tmp/gnupg
 
+cat >$tmp/gnupg/gpg-agent.conf <<END
+log-file $tmp/gnupg/AGENT.log
+END
+#debug-all
+
+setup='
+	export DGIT_TEST_REAL_GPG_AGENT=$(type -p gpg-agent)
+	export DGIT_STUNT_AGENT=$troot/tstunt/gpg-agent
+	export GNUPGHOME
+	t-tstunt gpg
+'
+
+eval "$setup"
+
 gpg --list-secret
 
-t-setup-done 'GNUPGHOME' 'gnupg'
+t-setup-done 'GNUPGHOME' 'gnupg' "$setup"
 
 t-ok
diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg
new file mode 100755
index 00000000..d71aa63f
--- /dev/null
+++ b/tests/tstunt/gpg
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+exec 							\
+$DGIT_TEST_REAL_GPG					\
+	--agent-program=$DGIT_STUNT_AGENT		\
+	"$@"
diff --git a/tests/tstunt/gpg-agent b/tests/tstunt/gpg-agent
new file mode 100755
index 00000000..96ae8392
--- /dev/null
+++ b/tests/tstunt/gpg-agent
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+exec 							\
+$DGIT_TEST_REAL_GPG_AGENT				\
+	--debug-quick-random				\
+	"$@"
-- 
2.30.2