From: Mattias Engdegård <mattiase@acm.org>
Date: Fri, 3 Nov 2023 17:06:04 +0000 (+0100)
Subject: Suggest alternative reason for ERT test duplication error
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=33fae4b02d6ed86487ddd0e75f2b3f5e87f6e137;p=emacs.git

Suggest alternative reason for ERT test duplication error

* lisp/emacs-lisp/ert.el (ert-set-test): Amend error message;
maybe the redefinition was caused by a file loaded twice.
(Bug#66782)

Suggested by Xiyue Deng.

(cherry picked from commit 425d23fbeaede81ab4f50b4073949cc1c8a3fbd0)
---

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index be9f013ebcf..5d001307125 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -151,7 +151,7 @@ mode.")
   (when (and noninteractive (get symbol 'ert--test))
     ;; Make sure duplicated tests are discovered since the older test would
     ;; be ignored silently otherwise.
-    (error "Test `%s' redefined" symbol))
+    (error "Test `%s' redefined (or loaded twice)" symbol))
   (define-symbol-prop symbol 'ert--test definition)
   definition)