summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2022-03-17 16:11:39 +0100
committerLars Ingebrigtsen <larsi@gnus.org>2022-03-17 16:13:01 +0100
commitedb28bf669b890b7498cad0fd818ffa38b5e13a9 (patch)
treeb6c2304a4dbf4900577b050d2aad2a07152321ff
parent52dd3fcf89c441be64a94eefa01b704c9aba5090 (diff)
downloademacs-edb28bf669b890b7498cad0fd818ffa38b5e13a9.tar.gz
Restore HOME after mailcap-parsing-and-mailcap-mime-info
* test/lisp/net/mailcap-tests.el (mailcap-parsing-and-mailcap-mime-info): Restore HOME after the test (bug#54435).
-rw-r--r--test/lisp/net/mailcap-tests.el78
1 files changed, 39 insertions, 39 deletions
diff --git a/test/lisp/net/mailcap-tests.el b/test/lisp/net/mailcap-tests.el
index b439c08c791..188706fc86a 100644
--- a/test/lisp/net/mailcap-tests.el
+++ b/test/lisp/net/mailcap-tests.el
@@ -79,45 +79,45 @@
;; execution errors when running the tests from the Makefile
;; because then HOME=/nonexistent.
(ert-with-temp-directory home
- (setenv "HOME" home)
- ;; Now parse our resource mailcap file.
- (mailcap-parse-mailcap (ert-resource-file "mailcap"))
-
- ;; Assert that we get what we have defined.
- (dolist (type '("audio/ogg" "audio/flac"))
- (should (string= "mpv %s" (mailcap-mime-info type))))
- (should (string= "aplay %s" (mailcap-mime-info "audio/x-wav")))
- (should (string= "emacsclient -t %s"
- (mailcap-mime-info "text/plain")))
- ;; evince is chosen because acroread has test=false and okular
- ;; comes later.
- (should (string= "evince %s"
- (mailcap-mime-info "application/pdf")))
- (should (string= "inkscape %s"
- (mailcap-mime-info "image/svg+xml")))
- (should (string= "eog %s"
- (mailcap-mime-info "image/jpg")))
- ;; With REQUEST being a number, all fields of the selected entry
- ;; should be returned.
- (should (equal '((viewer . "evince %s")
- (type . "application/pdf"))
- (mailcap-mime-info "application/pdf" 1)))
- ;; With 'all, all applicable entries should be returned.
- (should (equal '(((viewer . "evince %s")
- (type . "application/pdf"))
- ((viewer . "okular %s")
- (type . "application/pdf")))
- (mailcap-mime-info "application/pdf" 'all)))
- (let* ((c nil)
- (toggle (lambda (_) (setq c (not c)))))
- (mailcap-add "audio/ogg" "toggle %s" toggle)
- (should (string= "toggle %s" (mailcap-mime-info "audio/ogg")))
- ;; The test results are cached, so in order to have the test
- ;; re-evaluated, one needs to clear the cache.
- (setq mailcap-viewer-test-cache nil)
- (should (string= "mpv %s" (mailcap-mime-info "audio/ogg")))
- (setq mailcap-viewer-test-cache nil)
- (should (string= "toggle %s" (mailcap-mime-info "audio/ogg")))))))
+ (with-environment-variables (("HOME" home))
+ ;; Now parse our resource mailcap file.
+ (mailcap-parse-mailcap (ert-resource-file "mailcap"))
+
+ ;; Assert that we get what we have defined.
+ (dolist (type '("audio/ogg" "audio/flac"))
+ (should (string= "mpv %s" (mailcap-mime-info type))))
+ (should (string= "aplay %s" (mailcap-mime-info "audio/x-wav")))
+ (should (string= "emacsclient -t %s"
+ (mailcap-mime-info "text/plain")))
+ ;; evince is chosen because acroread has test=false and okular
+ ;; comes later.
+ (should (string= "evince %s"
+ (mailcap-mime-info "application/pdf")))
+ (should (string= "inkscape %s"
+ (mailcap-mime-info "image/svg+xml")))
+ (should (string= "eog %s"
+ (mailcap-mime-info "image/jpg")))
+ ;; With REQUEST being a number, all fields of the selected entry
+ ;; should be returned.
+ (should (equal '((viewer . "evince %s")
+ (type . "application/pdf"))
+ (mailcap-mime-info "application/pdf" 1)))
+ ;; With 'all, all applicable entries should be returned.
+ (should (equal '(((viewer . "evince %s")
+ (type . "application/pdf"))
+ ((viewer . "okular %s")
+ (type . "application/pdf")))
+ (mailcap-mime-info "application/pdf" 'all)))
+ (let* ((c nil)
+ (toggle (lambda (_) (setq c (not c)))))
+ (mailcap-add "audio/ogg" "toggle %s" toggle)
+ (should (string= "toggle %s" (mailcap-mime-info "audio/ogg")))
+ ;; The test results are cached, so in order to have the test
+ ;; re-evaluated, one needs to clear the cache.
+ (setq mailcap-viewer-test-cache nil)
+ (should (string= "mpv %s" (mailcap-mime-info "audio/ogg")))
+ (setq mailcap-viewer-test-cache nil)
+ (should (string= "toggle %s" (mailcap-mime-info "audio/ogg"))))))))
(defvar mailcap--test-result nil)
(defun mailcap--test-viewer ()