diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-02 11:13:05 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-10-02 11:13:05 -0400 |
| commit | d7f413b893012eb5c9c93cd724008c2c1faae56f (patch) | |
| tree | 4db7c6d5c96996c1f144165e03edb8c06fe0b7be /test | |
| parent | 8eb61e5261cebf6a566b1138562953350080156b (diff) | |
| parent | ef9bcf3b409648f36c5745e22d147f50a144524f (diff) | |
| download | emacs-d7f413b893012eb5c9c93cd724008c2c1faae56f.tar.gz | |
Merge from emacs-24
Diffstat (limited to 'test')
| -rw-r--r-- | test/ChangeLog | 7 | ||||
| -rw-r--r-- | test/automated/package-test.el | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 041ed7c1754..fb3bd746a73 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2014-10-02 Glenn Morris <rgm@gnu.org> + + * automated/package-test.el (with-package-test, package-test-signed): + Also set HOME to a temp value, in case the real one is absent (e.g. + hydra) or read-only. (Bug#18575) + (package-test-signed): Use skip-unless rather than expected-result. + 2014-09-26 Leo Liu <sdl.web@gmail.com> * automated/cl-lib.el (cl-digit-char-p, cl-parse-integer): New diff --git a/test/automated/package-test.el b/test/automated/package-test.el index b970cd7c9f8..a0c1359b132 100644 --- a/test/automated/package-test.el +++ b/test/automated/package-test.el @@ -89,6 +89,8 @@ "Set up temporary locations and variables for testing." (declare (indent 1)) `(let* ((package-test-user-dir (make-temp-file "pkg-test-user-dir-" t)) + (process-environment (cons (format "HOME=%s" package-test-user-dir) + process-environment)) (package-user-dir package-test-user-dir) (package-archives `(("gnu" . ,package-test-data-dir))) (old-yes-no-defn (symbol-function 'yes-or-no-p)) @@ -361,11 +363,15 @@ Must called from within a `tar-mode' buffer." (ert-deftest package-test-signed () "Test verifying package signature." - :expected-result (condition-case nil - (progn + (skip-unless (ignore-errors + (let ((homedir (make-temp-file "package-test" t))) + (unwind-protect + (let ((process-environment + (cons (format "HOME=%s" homedir) + process-environment))) (epg-check-configuration (epg-configuration)) - :passed) - (error :failed)) + t) + (delete-directory homedir t))))) (let* ((keyring (expand-file-name "key.pub" package-test-data-dir)) (package-test-data-dir (expand-file-name "data/package/signed" package-test-file-dir))) |