[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 9167fbd: Remove hacks for broken `with-suppressed-warnings'
From: |
Stefan Kangas |
Subject: |
master 9167fbd: Remove hacks for broken `with-suppressed-warnings' |
Date: |
Sun, 5 Dec 2021 06:18:48 -0500 (EST) |
branch: master
commit 9167fbd323c5f8ca1262372be0e213f284cadc67
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
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'.
---
test/lisp/obsolete/cl-tests.el | 14 ++++----------
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 0b8c117..659c51e 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 dd430ca..2e0d152 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"))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 9167fbd: Remove hacks for broken `with-suppressed-warnings',
Stefan Kangas <=