diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-12-31 07:50:15 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-12-31 07:50:15 -0800 |
| commit | 331f3f91045983ff24c66dcbb86f8032b1dcabab (patch) | |
| tree | f1407f0461fdca5199bd4421507d71a865b0994e | |
| parent | e729ff504b536ca67030382e5508c1c48f2d0944 (diff) | |
| parent | 9b6872b4e4fa782d9df313ab771c23ad1e7f8eff (diff) | |
| download | emacs-331f3f91045983ff24c66dcbb86f8032b1dcabab.tar.gz | |
Merge from origin/emacs-27
9b6872b4e4 ; * test/lisp/calc/calc-tests.el: Fix warnings
957cdca6f0 Make minibuffer-tests work in out-of-tree builds (bug#38816)
2065316749 Make comint-tests more robust (bug#38813)
| -rw-r--r-- | test/lisp/calc/calc-tests.el | 1 | ||||
| -rw-r--r-- | test/lisp/comint-tests.el | 12 | ||||
| -rw-r--r-- | test/lisp/minibuffer-tests.el | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/test/lisp/calc/calc-tests.el b/test/lisp/calc/calc-tests.el index 33e6b14827f..f85f8da5434 100644 --- a/test/lisp/calc/calc-tests.el +++ b/test/lisp/calc/calc-tests.el @@ -29,6 +29,7 @@ (require 'calc) (require 'calc-ext) (require 'calc-units) +(require 'calc-forms) ;; XXX The order in which calc libraries (in particular calc-units) ;; are loaded influences whether a calc integer in an expression 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) diff --git a/test/lisp/minibuffer-tests.el b/test/lisp/minibuffer-tests.el index 6b297244214..0605bad901a 100644 --- a/test/lisp/minibuffer-tests.el +++ b/test/lisp/minibuffer-tests.el @@ -82,7 +82,8 @@ (ert-deftest completion-table-test-quoting () (let ((process-environment - `("CTTQ1=ed" "CTTQ2=et/" ,@process-environment))) + `("CTTQ1=ed" "CTTQ2=et/" ,@process-environment)) + (default-directory (expand-file-name "test" source-directory))) (pcase-dolist (`(,input ,output) '( ;; Test that $ in files is properly $$ quoted. |