mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Fix structure of condition object in nested 'ert-fail'.
See the test 'ert-test-fail' for the expected structure. * lisp/emacs-lisp/ert.el (ert--should-signal-hook): Condition list should be (SYMBOL . DATA), not (SYMBOL DATA). * test/lisp/emacs-lisp/ert-tests.el (ert-test-fail-inside-should): Fix unit test.
This commit is contained in:
parent
432c1aaa80
commit
f4452bb814
2 changed files with 2 additions and 2 deletions
|
|
@ -261,7 +261,7 @@ DATA is displayed to the user and should state the reason for skipping."
|
|||
It should only be stopped when ran from inside ert--run-test-internal."
|
||||
(when (and (not (symbolp debugger)) ; only run on anonymous debugger
|
||||
(memq error-symbol '(ert-test-failed ert-test-skipped)))
|
||||
(funcall debugger 'error (list error-symbol data))))
|
||||
(funcall debugger 'error (cons error-symbol data))))
|
||||
|
||||
(defun ert--special-operator-p (thing)
|
||||
"Return non-nil if THING is a symbol naming a special operator."
|
||||
|
|
|
|||
|
|
@ -814,7 +814,7 @@ This macro is used to test if macroexpansion in `should' works."
|
|||
:body (lambda () (should (integerp (ert-fail "Boo"))))))))
|
||||
(should (ert-test-failed-p result))
|
||||
(should (equal (ert-test-failed-condition result)
|
||||
'(ert-test-failed ("Boo"))))))
|
||||
'(ert-test-failed "Boo")))))
|
||||
|
||||
|
||||
(provide 'ert-tests)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue