diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2019-08-22 20:48:19 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2019-09-01 14:40:00 -0400 |
| commit | 7e527af72cae65fdb3f61c7d92907cfdfd1e6ea3 (patch) | |
| tree | 8d15f308adf9794a6b4cd13d1368b1259bc8a330 | |
| parent | 8e420c09bcef1bf2a08b03deb74d5c663d898e33 (diff) | |
| download | emacs-7e527af72cae65fdb3f61c7d92907cfdfd1e6ea3.tar.gz | |
Fix non-deterministic process test
* test/src/process-tests.el (set-process-filter-t): Don't assume
subprocess output will come in a single chunk, keep waiting for more
data until next "prompt" is read from subprocess.
(cherry picked from commit aa49aa884053d0e8b33efe265f2aade19d1f3f3d)
| -rw-r--r-- | test/src/process-tests.el | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/test/src/process-tests.el b/test/src/process-tests.el index 7a6762a9226..ef057af6b79 100644 --- a/test/src/process-tests.el +++ b/test/src/process-tests.el @@ -154,24 +154,30 @@ (concat invocation-directory invocation-name) "-Q" "--batch" "--eval" (prin1-to-string - '(let (s) - (while (setq s (read-from-minibuffer "$ ")) + '(let ((s nil) (count 0)) + (while (setq s (read-from-minibuffer + (format "%d> " count))) (princ s) - (princ "\n"))))))) + (princ "\n") + (setq count (1+ count)))))))) (set-process-query-on-exit-flag proc nil) (send-string proc "one\n") - (should - (accept-process-output proc 1)) ; Read "one". - (should (equal (buffer-string) "$ one\n$ ")) + (while (not (equal (buffer-substring + (line-beginning-position) (point-max)) + "1> ")) + (accept-process-output proc)) ; Read "one". + (should (equal (buffer-string) "0> one\n1> ")) (set-process-filter proc t) ; Stop reading from proc. (send-string proc "two\n") (should-not (accept-process-output proc 1)) ; Can't read "two" yet. - (should (equal (buffer-string) "$ one\n$ ")) + (should (equal (buffer-string) "0> one\n1> ")) (set-process-filter proc nil) ; Resume reading from proc. - (should - (accept-process-output proc 1)) ; Read "two" from proc. - (should (equal (buffer-string) "$ one\n$ two\n$ "))))) + (while (not (equal (buffer-substring + (line-beginning-position) (point-max)) + "2> ")) + (accept-process-output proc)) ; Read "Two". + (should (equal (buffer-string) "0> one\n1> two\n2> "))))) (ert-deftest start-process-should-not-modify-arguments () "`start-process' must not modify its arguments in-place." |