From 31c5fd3bfba31687de31e1e4c3d3501401f023bc Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 6 Apr 2025 23:49:37 -0400
Subject: [PATCH] test/eieio: Silence warnings about slots and obsolete name
 arg

* test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
(eieio-test-method-order-list-3, eieio-test-method-order-list-6)
(eieio-test-method-order-list-7, eieio-test-method-order-list-8):
Delete obsolete name argument to constructors.
(eieio-test-method-order-list-4): Make sure backward compatibility is
active when testing the obsolete name arg.

* test/lisp/jsonrpc-tests.el (jsonrpc--call-with-emacsrpc-fixture):
Delete obsolete name argument to constructor.

* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el (derived-value):
Silence unknown slot warning.
---
 .../eieio-tests/eieio-test-methodinvoke.el           | 12 +++++++-----
 test/lisp/emacs-lisp/eieio-tests/eieio-tests.el      |  3 +++
 test/lisp/jsonrpc-tests.el                           |  1 -
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
index c9da7d92deb..13c33a219ee 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
@@ -138,7 +138,7 @@
 	       (:AFTER eitest-B-base1)
 	       (:AFTER eitest-B)
 	       )))
-    (eitest-F (eitest-B nil))
+    (eitest-F (eitest-B))
     (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
     (eieio-test-match ans)))
 
@@ -153,7 +153,9 @@
 (ert-deftest eieio-test-method-order-list-4 ()
   ;; Both of these situations should succeed.
   (should (eitest-H 'eitest-A))
-  (should (eitest-H (eitest-A nil))))
+  (let ((eieio-backward-compatibility t))
+    (with-suppressed-warnings ((obsolete eieio-constructor-name-arg))
+      (should (eitest-H (eitest-A nil))))))
 
 ;;; Return value from :PRIMARY
 ;;
@@ -213,7 +215,7 @@
 	       (:STATIC C-base1)
 	       (:STATIC C-base2)
 	       )))
-    (C nil)
+    (C)
     (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
     (eieio-test-match ans)))
 
@@ -262,7 +264,7 @@
 	       (:PRIMARY D-base2)
 	       (:PRIMARY D-base0)
 	       )))
-    (eitest-F (D nil))
+    (eitest-F (D))
     (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
     (eieio-test-match ans)))
 
@@ -304,7 +306,7 @@
 	       (:PRIMARY E-base2)
 	       (:PRIMARY E-base0)
 	       )))
-    (eitest-F (E nil))
+    (eitest-F (E))
     (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
     (eieio-test-match ans)))
 
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
index 51996fe51be..fced6bc3df2 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
@@ -430,6 +430,9 @@ METHOD is the method that was attempting to be called."
 (defclass virtual-slot-class ()
   ((base-value :initarg :base-value))
   "Class has real slot :base-value and simulated slot :derived-value.")
+
+(eieio-declare-slots derived-value)
+
 (with-suppressed-warnings ((obsolete defmethod)
                            (obsolete defgeneric))
   (defmethod slot-missing ((vsc virtual-slot-class)
diff --git a/test/lisp/jsonrpc-tests.el b/test/lisp/jsonrpc-tests.el
index 68eaae6c44b..148f5870434 100644
--- a/test/lisp/jsonrpc-tests.el
+++ b/test/lisp/jsonrpc-tests.el
@@ -76,7 +76,6 @@
           (setq endpoint
                 (make-instance
                  'jsonrpc--test-client
-                 "Emacs RPC client"
                  :process
                  (open-network-stream "JSONRPC test tcp endpoint"
                                       nil "localhost"