summaryrefslogtreecommitdiff
path: root/t/lib-gpg.sh
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2022-03-04 10:25:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-03-04 19:36:42 (GMT)
commitb0b70d54c4a17476f04ce17255c6558425c11367 (patch)
tree1857b55b2196a2d401ad320caa25ea7145e5acf5 /t/lib-gpg.sh
parentfa47dd6445faea84300844f7d70fe22e710bdc22 (diff)
downloadgit-b0b70d54c4a17476f04ce17255c6558425c11367.zip
git-b0b70d54c4a17476f04ce17255c6558425c11367.tar.gz
git-b0b70d54c4a17476f04ce17255c6558425c11367.tar.bz2
t/lib-gpg: kill all gpg components, not just gpg-agent
The gpg-agent is one of several processes that newer releases of GnuPG start automatically. Issue a kill to each of them to ensure they do not affect separate tests. (Yes, the separate GNUPGHOME should do that already. If we find that is case, we could drop the --kill entirely.) In terms of compatibility, the 'all' keyword was added to the --kill & --reload options in GnuPG 2.1.18. Debian and RHEL are often used as indicators of how a change might affect older systems we often try to support. - Debian Strech (old old stable), which has limited security support until June 2022, has GnuPG 2.1.18 (or 2.2.x in backports). - CentOS/RHEL 7, which is supported until June 2024, has GnuPG 2.0.22, which lacks the --kill option, so the change won't have any impact. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-gpg.sh')
-rw-r--r--t/lib-gpg.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 38e2c0f..1147855 100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -40,7 +40,7 @@ test_lazy_prereq GPG '
# > lib-gpg/ownertrust
mkdir "$GNUPGHOME" &&
chmod 0700 "$GNUPGHOME" &&
- (gpgconf --kill gpg-agent || : ) &&
+ (gpgconf --kill all || : ) &&
gpg --homedir "${GNUPGHOME}" --import \
"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
gpg --homedir "${GNUPGHOME}" --import-ownertrust \