From f02406c74a0a91b29073101912a4b80736a69581 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Fri, 23 Jan 2015 02:50:15 +0200 Subject: [PATCH] Fix package tests when TMPDIR is in HOME Fixes: debbugs:19657 * test/automated/package-test.el (with-package-test): Bind `abbreviated-home-dir' to nil. (package-test-describe-package, package-test-signed): Expect abbreviated directory names. --- test/ChangeLog | 10 +++++++++- test/automated/package-test.el | 7 +++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index af36b5d2bde..5a4e616f6c6 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,4 +1,12 @@ -2015-01-20 Jorgen Schaefer +2015-01-23 Dmitry Gutov + + Fix package tests when TMPDIR is in HOME. (Bug#19657) + * automated/package-test.el (with-package-test): + Bind `abbreviated-home-dir' to nil. + (package-test-describe-package, package-test-signed): + Expect abbreviated directory names. + +2015-01-22 Jorgen Schaefer * automated/package-test.el (package-test-install-prioritized): Re-add the test case and add priority to the correct repository diff --git a/test/automated/package-test.el b/test/automated/package-test.el index 3ea13dee4ad..a8488652c2f 100644 --- a/test/automated/package-test.el +++ b/test/automated/package-test.el @@ -95,6 +95,7 @@ (package-archives `(("gnu" . ,package-test-data-dir))) (old-yes-no-defn (symbol-function 'yes-or-no-p)) (default-directory package-test-file-dir) + abbreviated-home-dir package--initialized package-alist ,@(if update-news @@ -339,8 +340,7 @@ Must called from within a `tar-mode' buffer." (goto-char (point-min)) (should (search-forward "simple-single is an installed package." nil t)) (should (search-forward - (format "Status: Installed in `%s/' (unsigned)." - (expand-file-name "simple-single-1.3" package-user-dir)) + "Status: Installed in `~/simple-single-1.3/' (unsigned)." nil t)) (should (search-forward "Version: 1.3" nil t)) (should (search-forward "Summary: A single-file package with no dependencies" @@ -409,8 +409,7 @@ Must called from within a `tar-mode' buffer." (goto-char (point-min)) (should (search-forward "signed-good is an installed package." nil t)) (should (search-forward - (format "Status: Installed in `%s/'." - (expand-file-name "signed-good-1.0" package-user-dir)) + "Status: Installed in `~/signed-good-1.0/'." nil t)))))) -- 2.11.4.GIT