[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 99251ab 1/2: ; Avoid process kill query during te
From: |
Noam Postavsky |
Subject: |
[Emacs-diffs] emacs-26 99251ab 1/2: ; Avoid process kill query during term tests |
Date: |
Fri, 2 Feb 2018 18:13:16 -0500 (EST) |
branch: emacs-26
commit 99251ab62e8e2796a2ebc486afd7c0faf173a1b6
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
; Avoid process kill query during term tests
* test/lisp/term-tests.el (term-test-screen-from-input): Just unset
the process query-on-exit flag to rather than trying to end the
process before the end of test (which is generally unreliable).
---
test/lisp/term-tests.el | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/test/lisp/term-tests.el b/test/lisp/term-tests.el
index 16466ea..234dfa1 100644
--- a/test/lisp/term-tests.el
+++ b/test/lisp/term-tests.el
@@ -42,21 +42,13 @@
;; control chunking, and we don't have to worry about wrestling
;; with stty settings.
(let ((proc (get-buffer-process (current-buffer))))
- (unwind-protect
- (prog2 (if (consp input)
- (mapc (lambda (input) (term-emulate-terminal proc input))
input)
- (term-emulate-terminal proc input))
- (if return-var (buffer-local-value return-var (current-buffer))
- (buffer-substring-no-properties (point-min) (point-max)))
- ;; End the process to avoid query on buffer kill.
- (process-send-eof proc)
- (accept-process-output proc))
- ;; Make extra sure we don't get stuck in case we hit some
- ;; error before sending eof.
- (when (process-live-p proc)
- (kill-process proc)
- ;; Let Emacs update process status.
- (accept-process-output proc))))))
+ ;; Don't get stuck when we close the buffer.
+ (set-process-query-on-exit-flag proc nil)
+ (if (consp input)
+ (mapc (lambda (input) (term-emulate-terminal proc input))
input)
+ (term-emulate-terminal proc input))
+ (if return-var (buffer-local-value return-var (current-buffer))
+ (buffer-substring-no-properties (point-min) (point-max))))))
(ert-deftest term-simple-lines ()
(let ((str "\