summaryrefslogtreecommitdiff
path: root/test/lisp/comint-tests.el
diff options
context:
space:
mode:
authorMattias EngdegÄrd <mattiase@acm.org>2019-12-30 14:10:02 +0100
committerMattias EngdegÄrd <mattiase@acm.org>2019-12-30 21:00:27 +0100
commit206531674947789841a61bd428dd6babce933a0d (patch)
treec9c8eb41c1b569c5a6c9735751622f1ae34488ac /test/lisp/comint-tests.el
parent59f71d20eade09e6c2ef99fc4d9b99a161bff040 (diff)
downloademacs-206531674947789841a61bd428dd6babce933a0d.tar.gz
Make comint-tests more robust (bug#38813)
* test/lisp/comint-tests.el (comint-test-no-password-function) (comint-test-password-function-with-value) (comint-test-password-function-with-nil): Call accept-process-output as many times as needed, with a slightly more generous timeout (100 ms), after sending the Password: prompt to the process, since there must be time for some back-and-forth communication. Also clear the process-query-on-exit flag, since it doesn't go well with noninteractive tests.
Diffstat (limited to 'test/lisp/comint-tests.el')
-rw-r--r--test/lisp/comint-tests.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el
index c04134599f6..4c1c5cc5e20 100644
--- a/test/lisp/comint-tests.el
+++ b/test/lisp/comint-tests.el
@@ -64,10 +64,10 @@ alter normal password flow."
(with-temp-buffer
(make-comint-in-buffer "test-comint-password" (current-buffer) cat)
(let ((proc (get-buffer-process (current-buffer))))
+ (set-process-query-on-exit-flag proc nil)
(comint-send-string proc "Password: ")
- (accept-process-output proc 0 1 t)
(comint-send-eof)
- (accept-process-output proc 0 1 t)
+ (while (accept-process-output proc 0.1 nil t))
(should (string-equal (buffer-substring-no-properties (point-min) (point-max))
"Password: PaSsWoRd123\n"))
(when (process-live-p proc)
@@ -87,10 +87,10 @@ flow. Hook function returns alternative password."
(with-temp-buffer
(make-comint-in-buffer "test-comint-password" (current-buffer) cat)
(let ((proc (get-buffer-process (current-buffer))))
+ (set-process-query-on-exit-flag proc nil)
(comint-send-string proc "Password: ")
- (accept-process-output proc 0 1 t)
(comint-send-eof)
- (accept-process-output proc 0 1 t)
+ (while (accept-process-output proc 0.1 nil t))
(should (string-equal (buffer-substring-no-properties (point-min) (point-max))
"Password: MaGiC-PaSsWoRd789\n"))
(when (process-live-p proc)
@@ -110,10 +110,10 @@ password flow if it returns a nil value."
(with-temp-buffer
(make-comint-in-buffer "test-comint-password" (current-buffer) cat)
(let ((proc (get-buffer-process (current-buffer))))
+ (set-process-query-on-exit-flag proc nil)
(comint-send-string proc "Password: ")
- (accept-process-output proc 0 1 t)
(comint-send-eof)
- (accept-process-output proc 0 1 t)
+ (while (accept-process-output proc 0.1 nil t))
(should (string-equal (buffer-substring-no-properties (point-min) (point-max))
"Password: PaSsWoRd456\n"))
(when (process-live-p proc)