From c7e8cdc2eee113bf6d49f25c1ef6d9ef02f8f94b Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 10 Oct 2016 17:35:56 -0500 Subject: Kill gpg agent in package-test.el to avoid a race package-test.el should no longer fail during clean up. * Previously a delete-directories call raced with the gpg agent's own cleanup process (presumably triggered by the first deletion of one of the agent's sockets). As a result, it looks like the agent might delete one of its sockets after delete-directories had decided to delete the socket, but before it made the attempt, causing an exception. * To fix the problem, explicitly ask gpg-connect-agent to kill the agent before attempting to delete the gnupg home directory, and then delete via "rm -rf" to ignore any vanishing files. --- test/automated/package-test.el | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/automated/package-test.el b/test/automated/package-test.el index c4c856f3031..d0719588c89 100644 --- a/test/automated/package-test.el +++ b/test/automated/package-test.el @@ -149,7 +149,14 @@ package-test-fake-contents-file ,@body))) (when (file-directory-p package-test-user-dir) - (delete-directory package-test-user-dir t)) + (call-process "gpg-connect-agent" nil nil nil + "--homedir" (concat package-test-user-dir "/gnupg") + "--no-autostart" + "killagent" "/bye") + ;; Call "rm -rf" instead of delete-directory so that it won't + ;; choke if the gpg-agent sockets disappear during the + ;; recursive traversal. + (call-process "rm" nil nil nil "-r" package-test-user-dir)) (when (and (boundp 'package-test-archive-upload-base) (file-directory-p package-test-archive-upload-base))