[PATCH 1/4 v42] test: Don't return the result of checking for running emacs to the...

diff --git a/55/0835ca20db2cb1ce55d93d774cb35583d5283d b/55/0835ca20db2cb1ce55d93d774cb35583d5283d
new file mode 100644 (file)
index 0000000..60b1377
--- /dev/null
+++ b/55/0835ca20db2cb1ce55d93d774cb35583d5283d
@@ -0,0 +1,86 @@
+Return-Path: <dme@dme.org>\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 212C842119F\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 10:05:58 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 gFOQsNE2NuAz for <notmuch@notmuchmail.org>;\r
+       Mon, 23 Jan 2012 10:05:57 -0800 (PST)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 54708421192   for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 10:05:53 -0800\r
+ (PST)\r
+Received: by wgbdt12 with SMTP id dt12so2883140wgb.2\r
+       for <notmuch@notmuchmail.org>; Mon, 23 Jan 2012 10:05:52 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.102.169 with SMTP id fp9mr15207983wib.9.1327341952212;\r
+       Mon, 23 Jan 2012 10:05:52 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id dr5sm43607679wib.0.2012.01.23.10.05.50\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 23 Jan 2012 10:05:51 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id EC197A0950; Mon, 23 Jan 2012 18:05:48 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4 v42] test: Don't return the result of checking for running\r
+       emacs to the tester.\r
+Date: Mon, 23 Jan 2012 18:05:44 +0000\r
+Message-Id: <1327341947-29206-1-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1326804748-8989-2-git-send-email-dme@dme.org>\r
+References: <1326804748-8989-2-git-send-email-dme@dme.org>\r
+X-Gm-Message-State:\r
+ ALoCoQn0HAQtyqIkP1LhcgMgH7SFO9QevHbAC8j/4hycE05TYLf05lluvkUmMEHuarXS18vtZakS\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: Mon, 23 Jan 2012 18:05:58 -0000\r
+\r
+When checking for a running emacs, test_emacs evaluates the empty list\r
+'()'. This returns 'nil' when emacs is running, which is then\r
+prepended to the actual test result. Given that it is not part of the\r
+actual test output the test harness can incorrectly report test\r
+failure (or success).\r
+---\r
+\r
+Commentary updated.\r
+\r
+ test/test-lib.sh |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 0da60fb..82c686c 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -926,7 +926,7 @@ test_emacs () {\r
+                               --eval '(orphan-watchdog $$)'" || return\r
+               EMACS_SERVER="$server_name"\r
+               # wait until the emacs server is up\r
+-              until test_emacs '()' 2>/dev/null; do\r
++              until test_emacs '()' >/dev/null 2>/dev/null; do\r
+                       sleep 1\r
+               done\r
+       fi\r
+-- \r
+1.7.8.3\r
+\r