diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2015-01-23 02:50:15 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-01-23 15:33:25 +0200 |
| commit | 81fb8ab036d1755038d11a0a1a305a6062cc20a2 (patch) | |
| tree | 6b3bb7110edc85ab05aec2977496b69d39cb63c6 | |
| parent | 3a345b50628cd700031121ad1b2ac1b7fae7f920 (diff) | |
| download | emacs-81fb8ab036d1755038d11a0a1a305a6062cc20a2.tar.gz | |
Backport: 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.
(cherry picked from commit f02406c74a0a91b29073101912a4b80736a69581)
| -rw-r--r-- | test/ChangeLog | 8 | ||||
| -rw-r--r-- | test/automated/package-test.el | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/test/ChangeLog b/test/ChangeLog index 3f2d761dadd..ede6bd6476b 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,11 @@ +2015-01-23 Dmitry Gutov <dgutov@yandex.ru> + + 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 Wolfgang Jenkner <wjenkner@inode.at> * automated/calc-tests.el (calc-tests-equal, calc-tests-simple): diff --git a/test/automated/package-test.el b/test/automated/package-test.el index c550dd03aca..383af842d94 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 @@ -321,8 +322,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" @@ -391,8 +391,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)))))) (provide 'package-test) |