[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master a4a136217dd: Kill process in files-tests before exiting
From: |
Mattias Engdegård |
Subject: |
master a4a136217dd: Kill process in files-tests before exiting |
Date: |
Sat, 20 Apr 2024 07:12:57 -0400 (EDT) |
branch: master
commit a4a136217dd20ee701d28ac1adfc828bfdd4655e
Author: Mattias Engdegård <mattiase@acm.org>
Commit: Mattias Engdegård <mattiase@acm.org>
Kill process in files-tests before exiting
* test/lisp/files-tests.el
(files-tests-file-name-non-special-start-file-process):
Make sure that the subprocess is killed before the test concludes.
---
test/lisp/files-tests.el | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/test/lisp/files-tests.el b/test/lisp/files-tests.el
index d4c1ef3ba67..ad54addf06b 100644
--- a/test/lisp/files-tests.el
+++ b/test/lisp/files-tests.el
@@ -1196,18 +1196,21 @@ unquoted file names."
"emacs" (current-buffer)
(concat invocation-directory invocation-name)
"--version")))
- (accept-process-output proc)
- (goto-char (point-min))
- (should (search-forward emacs-version nil t))
- ;; Don't stop the test run with a query, as the subprocess
- ;; may or may not be dead by the time we reach here.
- (set-process-query-on-exit-flag proc nil)
- ;; On MS-Windows, wait for the process to die, since the OS
- ;; will not let us delete a directory that is the cwd of a
- ;; running process.
- (when (eq system-type 'windows-nt)
- (while (process-live-p proc)
- (sleep-for 0.1)))))))
+ (unwind-protect
+ (progn
+ (accept-process-output proc)
+ (goto-char (point-min))
+ (should (search-forward emacs-version nil t))
+ ;; Don't stop the test run with a query, as the subprocess
+ ;; may or may not be dead by the time we reach here.
+ (set-process-query-on-exit-flag proc nil)
+ ;; On MS-Windows, wait for the process to die, since the OS
+ ;; will not let us delete a directory that is the cwd of a
+ ;; running process.
+ (when (eq system-type 'windows-nt)
+ (while (process-live-p proc)
+ (sleep-for 0.1))))
+ (delete-process proc))))))
(files-tests--with-temp-non-special-and-file-name-handler
(tmpdir nospecial-dir t)
(with-temp-buffer
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master a4a136217dd: Kill process in files-tests before exiting,
Mattias Engdegård <=