Kill gpg-agents started by mml-sec-tests (bug#43358)

This commit is contained in:
Lars Ingebrigtsen 2020-09-13 16:05:19 +02:00
parent 467200dd6e
commit c2dea983e8

View file

@ -82,7 +82,9 @@ instead of gpg-agent."
;; not look in the proper places otherwise, see:
;; https://bugs.gnupg.org/gnupg/issue2126
(setenv "GNUPGHOME" epg-gpg-home-directory)
(funcall body))
(unwind-protect
(funcall body)
(mml-sec-test--kill-gpg-agent)))
(error
(setenv "GPG_AGENT_INFO" agent-info)
(setenv "GNUPGHOME" gpghome)
@ -903,4 +905,16 @@ So the second decryption fails."
(let ((with-smime nil))
(ert-run-tests-batch)))
(defun mml-sec-test--kill-gpg-agent ()
(dolist (pid (list-system-processes))
(let ((atts (process-attributes pid)))
(when (and (equal (cdr (assq 'user atts)) (user-login-name))
(equal (cdr (assq 'comm atts)) "gpg-agent")
(string-match
(concat "homedir.*"
(regexp-quote (expand-file-name "test/data/mml-sec"
source-directory)))
(cdr (assq 'args atts))))
(call-process "kill" nil nil nil (format "%d" pid))))))
;;; mml-sec-tests.el ends here