Changeset ee94de5 in mod_gnutls

Timestamp:

Oct 12, 2017, 12:54:14 PM (5 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, main, master, proxy-ticket, upstream

Children:

321912b

Parents:

acea635

git-author:

Thomas Klute <thomas2.klute@…> (10/12/17 12:41:31)

git-committer:

Thomas Klute <thomas2.klute@…> (10/12/17 12:54:14)

Message:

Test suite: Clean up for current GnuPG versions

Newer GnuPG versions start gpg-agent processes per GNUPGHOME (one for
every PGP identity) while creating the PGP certificates and leave an
authority/tofu.db file. Stop agent processes during check or
mostlyclean targets to be sure they are gone and do not interfere with
later test runs.

Location:

test

Files:

• Makefile.am (modified) (3 diffs)
• test_ca.mk (modified) (1 diff)

test/Makefile.am

@@ -114 +114 @@
 # necessary.
 MOSTLYCLEANFILES += */*.pgp */*.pgp.raw */*.gpg */*.gpg~ */gpg.conf \
-        authority/lock */*.kbx */*.kbx~ */S.gpg-agent */private-keys-v1.d/*
+        authority/lock */*.kbx */*.kbx~ */S.gpg-agent */private-keys-v1.d/* \
+        authority/tofu.db
 # GnuPG random pool, no need to regenerate on every build
 CLEANFILES += authority/random_seed
+
+# GnuPG 2 starts gpg-agent processes per GNUPGHOME (one for every PGP
+# identity) while creating the PGP certificates. This target is called
+# by both "check-local" and "mostlyclean-local": The former because
+# agent processes are started while preparing for "check" and are no
+# longer needed afterwards, the latter to make sure they are gone
+# along with their certificates.
+stop-gnupg-agent:
+        for id in $(pgp_identities) $(msva_home); do \
+                GNUPGHOME=$$id/ gpgconf --kill gpg-agent || true; \
+        done
+
+check-local: stop-gnupg-agent
 
 # Delete lock files for test servers on "mostlyclean" target.
@@ -129 +143 @@
         mkdir -p -m 0700 $(dir $@)
         GNUPGHOME=$(dir $@) gpg --import < $<
-        printf "%s:6:\n" "$$(GNUPGHOME=authority gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" | GNUPGHOME=$(dir $@) gpg --import-ownertrust
+        printf "%s:6:\n" "$$(GNUPGHOME=authority/ gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)" | GNUPGHOME=$(dir $@) gpg --import-ownertrust
         GNUPGHOME=$(dir $@) gpg --import < client/cert.pgp
         printf "keyserver does-not-exist.example\n" > $(msva_home)/gpg.conf
@@ -176 +190 @@
         mkdir -p $(extra_dirs)
 
-.PHONY: make-test-dirs clean-softhsm2-db
-
-mostlyclean-local: clean-softhsm2-db
+.PHONY: make-test-dirs clean-softhsm2-db stop-gnupg-agent
+
+
+mostlyclean-local: clean-softhsm2-db stop-gnupg-agent
         -rmdir $(pgp_identities:=/private-keys-v1.d) || true
 if USE_MSVA

test/test_ca.mk

@@ -48 +48 @@
 %/cert.pgp: %/minimal.pgp authority/minimal.pgp
         if test -r $@; then rm $@; fi
-        GNUPGHOME=authority $(GPG_FLOCK) gpg --import $<
-        GNUPGHOME=authority $(GPG_FLOCK) gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
-        GNUPGHOME=authority $(GPG_FLOCK) gpg --output $@ --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
+        GNUPGHOME=authority/ $(GPG_FLOCK) gpg --import $<
+        GNUPGHOME=authority/ $(GPG_FLOCK) gpg --batch --sign-key --no-tty --yes "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
+        GNUPGHOME=authority/ $(GPG_FLOCK) gpg --output $@ --armor --export "$$(GNUPGHOME=$(dir $@) gpg --with-colons --list-secret-keys --fingerprint | grep ^fpr: | cut -f 10 -d :)"
 
 # special cases for the authorities' root certs: