diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2017-08-31 04:57:43 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-02-02 18:09:13 -0500 |
| commit | 4c8157cfe06ef5715ba8533be164dd9a047711d0 (patch) | |
| tree | 311a54e83bb8382d3c86ef8749042469027b6f37 /test/lisp/files-tests.el | |
| parent | 99251ab62e8e2796a2ebc486afd7c0faf173a1b6 (diff) | |
| download | emacs-4c8157cfe06ef5715ba8533be164dd9a047711d0.tar.gz emacs-4c8157cfe06ef5715ba8533be164dd9a047711d0.tar.bz2 emacs-4c8157cfe06ef5715ba8533be164dd9a047711d0.zip | |
; 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.
Diffstat (limited to 'test/lisp/files-tests.el')
| -rw-r--r-- | test/lisp/files-tests.el | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el index 8dbfc2965ca..d51f8bb9f80 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")) |