diff options
| author | Michal Nazarewicz <mina86@mina86.com> | 2016-02-23 14:46:56 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-23 14:46:56 +1100 |
| commit | d57ca9f8519ac1b0054857ad57653b2bdb1196ea (patch) | |
| tree | 6c7f615d3027c533f9193cae12d3d58df91f4072 /test/lisp/vc/vc-bzr-tests.el | |
| parent | a77c6799c1f3ae30c8bbf26aa376f52c33cd554f (diff) | |
| download | emacs-d57ca9f8519ac1b0054857ad57653b2bdb1196ea.tar.gz emacs-d57ca9f8519ac1b0054857ad57653b2bdb1196ea.tar.bz2 emacs-d57ca9f8519ac1b0054857ad57653b2bdb1196ea.zip | |
Make use of the `ert-with-function-mocked' macro
* test/lisp/calendar/icalendar-tests.el (icalendar--create-uid):
* test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-bug9781): Use
`ert-with-function-mocked' instead of implementing the fragile
`unwind-protect' logic openly.
Diffstat (limited to 'test/lisp/vc/vc-bzr-tests.el')
| -rw-r--r-- | test/lisp/vc/vc-bzr-tests.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el index 82721eeee4e..98d176ca1ee 100644 --- a/test/lisp/vc/vc-bzr-tests.el +++ b/test/lisp/vc/vc-bzr-tests.el @@ -25,6 +25,7 @@ ;;; Code: (require 'ert) +(require 'ert-x) (require 'vc-bzr) (require 'vc-dir) @@ -101,12 +102,8 @@ (while (vc-dir-busy) (sit-for 0.1)) (vc-dir-mark-all-files t) - (let ((f (symbol-function 'y-or-n-p))) - (unwind-protect - (progn - (fset 'y-or-n-p (lambda (prompt) t)) - (vc-next-action nil)) - (fset 'y-or-n-p f))) + (ert-with-function-mocked y-or-n-p (lambda (_) t) + (vc-next-action nil)) (should (get-buffer "*vc-log*"))) (delete-directory homedir t)))) |