X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib.el;h=97ae5938da62a42eb778c626429783350bca93d8;hb=5af65f65e8a32fb7f11f5b1c2036e35a4c4809e2;hp=4e7f5cfc30a7538011124717884b026a19fc2f06;hpb=3b24b396c4c9178603dec5380b4e89f6795dee1f;p=notmuch

diff --git a/test/test-lib.el b/test/test-lib.el
index 4e7f5cfc..97ae5938 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -20,8 +20,11 @@
 ;;
 ;; Authors: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>
 
-;; avoid crazy 10-column default of --batch
-(set-frame-width (window-frame (get-buffer-window)) 80)
+;; `read-file-name' by default uses `completing-read' function to read
+;; user input.  It does not respect `standard-input' variable which we
+;; use in tests to provide user input.  So replace it with a plain
+;; `read' call.
+(setq read-file-name-function (lambda (&rest _) (read)))
 
 (defun notmuch-test-wait ()
   "Wait for process completion."
@@ -51,3 +54,10 @@ FILENAME is OUTPUT."
 	  (setq str (concat str (buffer-substring start next-pos))))
 	(setq start next-pos)))
     str))
+
+(defun orphan-watchdog (pid)
+  "Periodically check that the process with id PID is still
+running, quit if it terminated."
+  (if (not (process-attributes pid))
+      (kill-emacs)
+    (run-at-time "1 min" nil 'orphan-watchdog pid)))