X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib.el;h=437f83f44d08e8224465181a08a0f17e748a0413;hb=435cd249a014b37ecfedf4d38a3a6b6471c2730a;hp=d26b49f7551f1cd3bc159e241f64976e5e37db58;hpb=16aa65ba2575fd504c31d9671d8c5150f8e8adf1;p=notmuch

diff --git a/test/test-lib.el b/test/test-lib.el
index d26b49f7..437f83f4 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -77,19 +77,22 @@ invisible text."
 	(setq start next-pos)))
     str))
 
+;; process-attributes is not defined everywhere, so define an
+;; alternate way to test if a process still exists.
+
+(defun test-process-running (pid)
+  (= 0
+   (signal-process pid 0)))
+
 (defun orphan-watchdog-check (pid)
   "Periodically check that the process with id PID is still
 running, quit if it terminated."
-  (if (not (process-attributes pid))
+  (if (not (test-process-running pid))
       (kill-emacs)))
 
 (defun orphan-watchdog (pid)
   "Initiate orphan watchdog check."
-  ; If process-attributes returns nil right away, that probably means
-  ; it is unimplimented. So we delay two minutes before killing emacs.
-  (if (process-attributes pid)
-      (run-at-time 60 60 'orphan-watchdog-check pid)
-    (run-at-time 120 60 'orphan-watchdog-check pid)))
+  (run-at-time 60 60 'orphan-watchdog-check pid))
 
 (defun hook-counter (hook)
   "Count how many times a hook is called.  Increments
@@ -162,3 +165,8 @@ nothing."
 
      (t
       (notmuch-test-report-unexpected output expected)))))
+
+;; For historical reasons, we hide deleted tags by default in the test
+;; suite
+(setq notmuch-tag-deleted-formats
+      '((".*" nil)))