emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 3785fe52e46: ; Fix a failure when running server-tests via the co


From: Jim Porter
Subject: master 3785fe52e46: ; Fix a failure when running server-tests via the command line
Date: Sat, 10 Dec 2022 02:01:21 -0500 (EST)

branch: master
commit 3785fe52e4692ffef14c0a1e50361c22d66fabe8
Author: Jim Porter <jporterbugs@gmail.com>
Commit: Jim Porter <jporterbugs@gmail.com>

    ; Fix a failure when running server-tests via the command line
    
    * test/lisp/server-tests.el
    (server-tests/server-force-stop/keeps-frames): Delete every new frame
    created during the test.  On some systems, 'delete-terminal' will
    delete the frames for us, so this ensures that if there are no new
    frames, nothing happens.
---
 test/lisp/server-tests.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/lisp/server-tests.el b/test/lisp/server-tests.el
index ebf84481c61..5ef66052c80 100644
--- a/test/lisp/server-tests.el
+++ b/test/lisp/server-tests.el
@@ -218,8 +218,8 @@ long as this works, the problem in bug#58877 shouldn't 
occur."
                  (eq (terminal-live-p terminal) t)
                  (not (eq system-type 'windows-nt)))
         (delete-terminal terminal)))
-    ;; Delete the created frame.
-    (delete-frame (car (cl-set-difference (frame-list) starting-frames))
-                  t)))
+    ;; If there are any new frames remaining, delete them.
+    (mapc (lambda (frame) (delete-frame frame t))
+          (cl-set-difference (frame-list) starting-frames))))
 
 ;;; server-tests.el ends here



reply via email to

[Prev in Thread] Current Thread [Next in Thread]