From a6c565be751393ef52d2b74919b7ce2744019394 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 3 Aug 2017 22:27:28 +0100 Subject: test suite: stunt gnupg runs gpg again if it exits status 2 Work around gnupg agent connection races by having our stunt gpg wrapper simply try running gpg again, once, if it exits 2. This does not fully suppress the bug but it does significantly reduce the probability. Signed-off-by: Ian Jackson --- tests/tstunt/gpg | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/tstunt/gpg b/tests/tstunt/gpg index d71aa63..790c46c 100755 --- a/tests/tstunt/gpg +++ b/tests/tstunt/gpg @@ -1,6 +1,20 @@ #!/bin/sh set -e -exec \ + +for attempt in '' exec; do + +set +e +$attempt \ $DGIT_TEST_REAL_GPG \ --agent-program=$DGIT_STUNT_AGENT \ "$@" +rc=$? +set -e + +if [ $rc != 2 ]; then exit $rc; fi + +echo >&2 "WARNING - GNUPG FAILED $rc - STUNT GNUPG $attempt $*" + +done + +exit 127 -- cgit v1.2.3