[PATCH] test/emacs: replace the use of process-attributes with signal-process

diff --git a/16/4749b3f54396b6a5331f155d38bb0133159687 b/16/4749b3f54396b6a5331f155d38bb0133159687
new file mode 100644 (file)
index 0000000..d4ab610
--- /dev/null
+++ b/16/4749b3f54396b6a5331f155d38bb0133159687
@@ -0,0 +1,102 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 127D8431FD0\r
+       for <notmuch@notmuchmail.org>; Sat, 11 Jan 2014 09:25:59 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id mUosXxvQ2SQs for <notmuch@notmuchmail.org>;\r
+       Sat, 11 Jan 2014 09:25:52 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D8EAC431FC3\r
+       for <notmuch@notmuchmail.org>; Sat, 11 Jan 2014 09:25:52 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1W22Jk-0004S2-HV; Sat, 11 Jan 2014 13:25:52 -0400\r
+Received: (nullmailer pid 16887 invoked by uid 1000); Sat, 11 Jan 2014\r
+       17:25:48 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] test/emacs: replace the use of process-attributes with\r
+       signal-process\r
+Date: Sat, 11 Jan 2014 13:25:39 -0400\r
+Message-Id: <1389461139-20249-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <m2bnziygdu.fsf@guru.guru-group.fi>\r
+References: <m2bnziygdu.fsf@guru.guru-group.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 11 Jan 2014 17:25:59 -0000\r
+\r
+In some environments (at least Hurd), process-attributes is\r
+unimplimented and always returns nil.  This ends up causing test\r
+failures (see e.g. id:87a9ffofsc.fsf@zancas.localnet).\r
+\r
+Historically and according to POSIX 1003.1-2001, a signal of 0 can be\r
+used to check the validity of a pid. This seems less heinous than\r
+parsing the output of ps(1).\r
+---\r
+\r
+Thanks to Domo for the simpler solution. Now that I think about it,\r
+perhaps this makes sense as a debian only update, since it currently\r
+fails only on Debian/Hurd, which according to the GNU project is the\r
+only "working distribution\r
+\r
+ test/test-lib.el | 15 +++++++++------\r
+ 1 file changed, 9 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index d26b49f..37fcb3d 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -77,19 +77,22 @@ invisible text."\r
+       (setq start next-pos)))\r
+     str))\r
+ \r
++;; process-attributes is not defined everywhere, so define an\r
++;; alternate way to test if a process still exists.\r
++\r
++(defun test-process-running (pid)\r
++  (= 0\r
++   (signal-process pid 0)))\r
++\r
+ (defun orphan-watchdog-check (pid)\r
+   "Periodically check that the process with id PID is still\r
+ running, quit if it terminated."\r
+-  (if (not (process-attributes pid))\r
++  (if (not (test-process-running pid))\r
+       (kill-emacs)))\r
+ \r
+ (defun orphan-watchdog (pid)\r
+   "Initiate orphan watchdog check."\r
+-  ; If process-attributes returns nil right away, that probably means\r
+-  ; it is unimplimented. So we delay two minutes before killing emacs.\r
+-  (if (process-attributes pid)\r
+-      (run-at-time 60 60 'orphan-watchdog-check pid)\r
+-    (run-at-time 120 60 'orphan-watchdog-check pid)))\r
++  (run-at-time 60 60 'orphan-watchdog-check pid))\r
+ \r
+ (defun hook-counter (hook)\r
+   "Count how many times a hook is called.  Increments\r
+-- \r
+1.8.5.2\r
+\r