Move epg.el test data to follow our conventions

* test/lisp/epg-tests.el (ert-x): Require.
(epg-tests-data-directory): Remove variable.
(with-epg-tests): Use ert-resource-file.
* test/lisp/epg-resources/*: Moved from test/data/epg/.

4 files changed, 4 insertions, 8 deletions

diff --git a/test/data/epg/dummy-pinentry b/test/lisp/epg-resources/dummy-pinentry
index 2228dfb0c6d..2228dfb0c6d 100755
--- a/test/data/epg/dummy-pinentry
+++ b/test/lisp/epg-resources/dummy-pinentry
diff --git a/test/data/epg/pubkey.asc b/test/lisp/epg-resources/pubkey.asc
index c0bf28f6200..c0bf28f6200 100644
--- a/test/data/epg/pubkey.asc
+++ b/test/lisp/epg-resources/pubkey.asc
diff --git a/test/data/epg/seckey.asc b/test/lisp/epg-resources/seckey.asc
index 4ac7ba4a502..4ac7ba4a502 100644
--- a/test/data/epg/seckey.asc
+++ b/test/lisp/epg-resources/seckey.asc
diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el
index 2a9c021c67b..c9c92f529be 100644
--- a/test/lisp/epg-tests.el
+++ b/test/lisp/epg-tests.el
@@ -22,14 +22,11 @@
 ;;; Code:
 
 (require 'ert)
+(require 'ert-x)
 (require 'epg)
 
 (defvar epg-tests-context nil)
 
-(defvar epg-tests-data-directory
-  (expand-file-name "data/epg" (getenv "EMACS_TEST_DIRECTORY"))
-  "Directory containing epg test data.")
-
 (defconst epg-tests--config-program-alist
   ;; The default `epg-config--program-alist' requires gpg2 2.1 or
   ;; greater due to some practical problems with pinentry.  But most
@@ -85,8 +82,7 @@
                 '(with-temp-file (expand-file-name
                                   "gpg-agent.conf" epg-tests-home-directory)
                    (insert "pinentry-program "
-                           (expand-file-name "dummy-pinentry"
-                                             epg-tests-data-directory)
+                           (ert-resource-file "dummy-pinentry")
                            "\n")
                    (epg-context-set-passphrase-callback
                     context
@@ -94,11 +90,11 @@
            ,(if require-public-key
                 '(epg-import-keys-from-file
                   context
-                  (expand-file-name "pubkey.asc" epg-tests-data-directory)))
+                  (ert-resource-file "pubkey.asc")))
            ,(if require-secret-key
                 '(epg-import-keys-from-file
                   context
-                  (expand-file-name "seckey.asc" epg-tests-data-directory)))
+                  (ert-resource-file "seckey.asc")))
            (with-temp-buffer
              (make-local-variable 'epg-tests-context)
              (setq epg-tests-context context)