test suite: gnupg: Do not count as "trouble" a 0-byte input file failure

apt-key seems to feed gpg --import an empty pipe.  This makes gpg exit
with status 2.  We think this is trouble, but it isn't.

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

diff --git a/tests/tstunt/gpg-locked b/tests/tstunt/gpg-locked
index ddb880f6c208fa7cb47a6938c67e1f09ec3bf87d..9dfda2695cda287f3b7d619f5e33cedb9cc61ec8 100755 (executable)
--- a/tests/tstunt/gpg-locked
+++ b/tests/tstunt/gpg-locked
@@ -29,15 +29,19 @@ if [ $rc != 2 ]; then exit $rc; fi
 
 echo >&2 "WARNING - GNUPG FAILED $rc - STUNT GNUPG $attempt $stdin_tmp_bytes $*"
 
-sh -ec '
-       if [ "x$DGIT_GNUPG_STUNT_ERRLOG" != x ]; then
-               exec >"$DGIT_GNUPG_STUNT_ERRLOG"
-       else
-               exec 2>/dev/null
-       fi
-       exec >/dev/tty
-       printf "%s\n" "$*"
-' x "GNUPG WRAPPER - TROUBLE - $HOME $GNUPGHOME - FAILED $rc $attempt $stdin_tmp_bytes $*"
+if [ "$stdin_tmp_bytes" = 0 ]; then
+       sleep 5
+else
+       sh -ec '
+               if [ "x$DGIT_GNUPG_STUNT_ERRLOG" != x ]; then
+                       exec >"$DGIT_GNUPG_STUNT_ERRLOG"
+               else
+                       exec 2>/dev/null
+               fi
+               exec >/dev/tty
+               printf "%s\n" "$*"
+       ' x "GNUPG WRAPPER - TROUBLE - $HOME $GNUPGHOME - FAILED $rc $attempt $stdin_tmp_bytes $*"
+fi
 
 sleep 10