From: Todd Zullinger <tmz@pobox.com>
Date: Fri, 8 Feb 2019 03:17:46 +0000 (-0500)
Subject: t/lib-gpg: drop redundant killing of gpg-agent
X-Git-Tag: v2.21.0-rc1~26^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e285e7803217c56f5e86a0abdec4b7fa8bc1058;p=thirdparty%2Fgit.git

t/lib-gpg: drop redundant killing of gpg-agent

In 53fc999306 ("gpg-interface t: extend the existing GPG tests with
GPGSM", 2018-07-20), the gpgconf call which kills gpg-agent was copied
from the existing gpg setup code.

The reason for killing gpg-agent is given in 29ff1f8f74 ("t: lib-gpg:
flush gpg agent on startup", 2017-07-20):

  When running gpg-relevant tests, a gpg-daemon is spawned for each
  GNUPGHOME used. This daemon may stay running after the test and cache
  file descriptors for the trash directories, even after the trash
  directory is removed. This leads to ENOENT errors when attempting to
  create files if tests are run multiple times.

  Add a cleanup script to force flushing the gpg-agent for that GNUPGHOME
  (if any) before setting up the GPG relevant-environment.

Killing gpg-agent once per test is sufficient.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index d90160eb0b..041f10171a 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -61,7 +61,6 @@ then
 			| grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
 			${GNUPGHOME}/trustlist.txt &&
 		echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
-		(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
 		echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
 			-u committer@example.com -o /dev/null --sign - 2>&1 &&
 		test_set_prereq GPGSM