diff options
| author | Stefan Kangas <stefan@marxist.se> | 2020-10-24 02:17:37 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2020-10-24 02:21:07 +0200 |
| commit | ab7dddea907ebb226fd657cc2fad441a374dfd7f (patch) | |
| tree | a9bea25fe89ce801edb1d4636080fb9272b978ca /test/lisp/gnus/mml-sec-tests.el | |
| parent | 72c9d4bee112a7e44316b04f361cc4ad3b16cf76 (diff) | |
| download | emacs-ab7dddea907ebb226fd657cc2fad441a374dfd7f.tar.gz emacs-ab7dddea907ebb226fd657cc2fad441a374dfd7f.tar.bz2 emacs-ab7dddea907ebb226fd657cc2fad441a374dfd7f.zip | |
Move mml-sec.el test data to follow our conventions
* test/lisp/gnus/mml-sec-tests.el (ert-x): Require.
(mml-secure-test-fixture, mml-sec-test--kill-gpg-agent):
Use ert-resource-directory.
* test/lisp/gnus/mml-sec-resources/*: Moved from test/data/mml-sec/.
* .gitignore: Update location of moved file "random_seed".
Diffstat (limited to 'test/lisp/gnus/mml-sec-tests.el')
| -rw-r--r-- | test/lisp/gnus/mml-sec-tests.el | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/lisp/gnus/mml-sec-tests.el b/test/lisp/gnus/mml-sec-tests.el index 427018520c8..3da620d64e1 100644 --- a/test/lisp/gnus/mml-sec-tests.el +++ b/test/lisp/gnus/mml-sec-tests.el @@ -23,6 +23,7 @@ ;;; Code: (require 'ert) +(require 'ert-x) (require 'message) (require 'epa) @@ -65,8 +66,7 @@ instead of gpg-agent." (let ((agent-info (getenv "GPG_AGENT_INFO")) (gpghome (getenv "GNUPGHOME"))) (condition-case error - (let ((epg-gpg-home-directory - (expand-file-name "test/data/mml-sec" source-directory)) + (let ((epg-gpg-home-directory (ert-resource-directory)) (mml-smime-use 'epg) ;; Create debug output in empty epg-debug-buffer. (epg-debug t) @@ -880,8 +880,7 @@ So the second decryption fails." (equal (cdr (assq 'comm atts)) "gpg-agent") (string-match (concat "homedir.*" - (regexp-quote (expand-file-name "test/data/mml-sec" - source-directory))) + (regexp-quote (ert-resource-directory))) (cdr (assq 'args atts)))) (call-process "kill" nil nil nil (format "%d" pid)))))) |