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".
This commit is contained in:
parent
72c9d4bee1
commit
ab7dddea90
36 changed files with 4 additions and 5 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -152,7 +152,7 @@ test/manual/etags/regexfile
|
|||
test/manual/etags/ETAGS
|
||||
test/manual/etags/CTAGS
|
||||
test/manual/indent/*.new
|
||||
test/data/mml-sec/random_seed
|
||||
test/lisp/gnus/mml-sec-resources/random_seed
|
||||
|
||||
# ctags, etags.
|
||||
TAGS
|
||||
|
|
|
@ -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))))))
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue