1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-26 07:00:35 -08:00

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)
This commit is contained in:
Glenn Morris 2019-12-31 07:50:15 -08:00
commit 331f3f9104
3 changed files with 9 additions and 7 deletions

View file

@ -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

View file

@ -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)

View file

@ -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.