diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-12-05 12:08:27 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-12-05 12:08:27 +0100 |
| commit | 9167fbd323c5f8ca1262372be0e213f284cadc67 (patch) | |
| tree | 70c6e18ff92f0b2975c2203b6b5d85686a504595 | |
| parent | bf869aa698a3c7f09cf9614b80906fcb4d343aba (diff) | |
| download | emacs-9167fbd323c5f8ca1262372be0e213f284cadc67.tar.gz emacs-9167fbd323c5f8ca1262372be0e213f284cadc67.tar.bz2 emacs-9167fbd323c5f8ca1262372be0e213f284cadc67.zip | |
Remove hacks for broken `with-suppressed-warnings'
* test/lisp/obsolete/cl-tests.el (labels-function-quoting):
* test/lisp/tar-mode-tests.el (tar-mode-test-tar-grind-file-mode):
Remove hack for broken `with-suppressed-warnings'.
| -rw-r--r-- | test/lisp/obsolete/cl-tests.el | 14 | ||||
| -rw-r--r-- | test/lisp/tar-mode-tests.el | 9 |
2 files changed, 6 insertions, 17 deletions
diff --git a/test/lisp/obsolete/cl-tests.el b/test/lisp/obsolete/cl-tests.el index 0b8c1178f3a..659c51ebcf8 100644 --- a/test/lisp/obsolete/cl-tests.el +++ b/test/lisp/obsolete/cl-tests.el @@ -25,17 +25,11 @@ (require 'cl)) (require 'ert) - - -;; Hack to work around the ERT limitation that we can't reliably use -;; `with-suppressed-warnings' inside an `ert-deftest'. (Bug#36568) -(defun cl-tests-labels-test () - (with-suppressed-warnings ((obsolete labels)) - (funcall (labels ((foo () t)) - #'foo)))) - (ert-deftest labels-function-quoting () "Test that #'foo does the right thing in `labels'." ; Bug#31792. - (should (eq (cl-tests-labels-test) t))) + (with-suppressed-warnings ((obsolete labels)) + (should (eq (funcall (labels ((foo () t)) + #'foo)) + t)))) ;;; cl-tests.el ends here diff --git a/test/lisp/tar-mode-tests.el b/test/lisp/tar-mode-tests.el index dd430cac2fd..2e0d1529a57 100644 --- a/test/lisp/tar-mode-tests.el +++ b/test/lisp/tar-mode-tests.el @@ -24,12 +24,6 @@ (defvar tar-mode-tests-data-directory (expand-file-name "test/data/decompress" source-directory)) -;; Hack to work around the ERT limitation that we can't reliably use -;; `with-suppressed-warnings' inside an `ert-deftest'. (Bug#36568) -(defun tar-mode-tests--tar-grind-file-mode (&rest args) - (with-suppressed-warnings ((obsolete tar-grind-file-mode)) - (apply #'tar-grind-file-mode args))) - (ert-deftest tar-mode-test-tar-grind-file-mode () (let ((alist (list (cons 448 "rwx------") (cons 420 "rw-r--r--") @@ -38,7 +32,8 @@ (cons 1024 "-----S---") (cons 2048 "--S------")))) (dolist (x alist) - (should (equal (cdr x) (tar-mode-tests--tar-grind-file-mode (car x))))))) + (with-suppressed-warnings ((obsolete tar-grind-file-mode)) + (should (equal (cdr x) (tar-grind-file-mode (car x)))))))) (ert-deftest tar-mode-test-tar-extract-gz () (skip-unless (executable-find "gzip")) |