[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 4c8157c 2/2: ; Let files-tests.el pass multiple t
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 4c8157c 2/2: ; Let files-tests.el pass multiple times in a session |
Date: |
Fri, 2 Feb 2018 18:13:16 -0500 (EST) |
branch: emacs-26
commit 4c8157cfe06ef5715ba8533be164dd9a047711d0
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
; Let files-tests.el pass multiple times in a session
* test/lisp/files-tests.el (files-test-local-variables): Use `cl-letf'
instead of advice. The advice was not being activated on the second
run.
---
test/lisp/files-tests.el | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index 8dbfc29..d51f8bb 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -135,18 +135,16 @@ form.")
(ert-deftest files-test-local-variables ()
"Test the file-local variables implementation."
- (unwind-protect
- (progn
- (defadvice hack-local-variables-confirm (around files-test activate)
- (setq files-test-result 'query)
- nil)
- (dolist (test files-test-local-variable-data)
- (let ((str (concat "text\n\n;; Local Variables:\n;; "
- (mapconcat 'identity (car test) "\n;; ")
- "\n;; End:\n")))
- (dolist (subtest (cdr test))
- (should (file-test--do-local-variables-test str subtest))))))
- (ad-disable-advice 'hack-local-variables-confirm 'around 'files-test)))
+ (cl-letf (((symbol-function 'hack-local-variables-confirm)
+ (lambda (&rest _)
+ (setq files-test-result 'query)
+ nil)))
+ (dolist (test files-test-local-variable-data)
+ (let ((str (concat "text\n\n;; Local Variables:\n;; "
+ (mapconcat 'identity (car test) "\n;; ")
+ "\n;; End:\n")))
+ (dolist (subtest (cdr test))
+ (should (file-test--do-local-variables-test str subtest)))))))
(defvar files-test-bug-18141-file
(expand-file-name "data/files-bug18141.el.gz" (getenv
"EMACS_TEST_DIRECTORY"))