emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-24 r117531: package-test tweaks for hydra


From: Glenn Morris
Subject: [Emacs-diffs] emacs-24 r117531: package-test tweaks for hydra
Date: Wed, 01 Oct 2014 23:24:32 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117531
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18575
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-10-01 19:24:28 -0400
message:
  package-test tweaks for hydra
  
  * test/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. 
  (package-test-signed): Use skip-unless rather than expected-result.
modified:
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/package-test.el 
packagetest.el-20130627091655-6mb005jio30t2i3i-1
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-09-01 22:51:46 +0000
+++ b/test/ChangeLog    2014-10-01 23:24:28 +0000
@@ -1,3 +1,10 @@
+2014-10-01  Glenn Morris  <address@hidden>
+
+       * 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-01  Fabián Ezequiel Gallina  <address@hidden>
 
        * automated/python-tests.el:

=== modified file 'test/automated/package-test.el'
--- a/test/automated/package-test.el    2014-06-25 21:59:28 +0000
+++ b/test/automated/package-test.el    2014-10-01 23:24:28 +0000
@@ -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))
@@ -360,11 +362,15 @@
 
 (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)))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]