[PATCH 2/4 v2] test: `notmuch-test-run' should protect against buffer switching.

diff --git a/5a/33e15871834ba6e266dca45353caf5435c09ea b/5a/33e15871834ba6e266dca45353caf5435c09ea
new file mode 100644 (file)
index 0000000..7168b80
--- /dev/null
+++ b/5a/33e15871834ba6e266dca45353caf5435c09ea
@@ -0,0 +1,84 @@
+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 7764E429E3C\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 07:45:34 -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 2VRMUSWJJWKD for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jan 2012 07:45:34 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E93C8431FBC\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 07:45:33 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so2602173wib.26\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 07:45:32 -0800 (PST)\r
+MIME-Version: 1.0\r
+Received: by 10.180.96.3 with SMTP id do3mr12157833wib.1.1327506332692;\r
+       Wed, 25 Jan 2012 07:45:32 -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 j16sm2701702wie.4.2012.01.25.07.45.31\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jan 2012 07:45:31 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id D9EA59FEEC; Wed, 25 Jan 2012 15:45:29 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/4 v2] test: `notmuch-test-run' should protect against buffer\r
+       switching.\r
+Date: Wed, 25 Jan 2012 15:45:26 +0000\r
+Message-Id: <1327506328-22126-3-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1327506328-22126-1-git-send-email-dme@dme.org>\r
+References: <1327503908-17226-1-git-send-email-dme@dme.org>\r
+       <1327506328-22126-1-git-send-email-dme@dme.org>\r
+X-Gm-Message-State:\r
+ ALoCoQlJjOcxbis7sJJgRFgLuwmJ44+T6fAGn0HzCp+JbHTDE69jgSIKPkTcN3e0FMmqKE535JQ4\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: Wed, 25 Jan 2012 15:45:34 -0000\r
+\r
+The body of the test may cause the current buffer to change. Ensure\r
+that the output goes to the correct buffer by switching back before\r
+inserting it.\r
+---\r
+ test/test-lib.el |    4 +++-\r
+ 1 files changed, 3 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/test/test-lib.el b/test/test-lib.el\r
+index 36e793a..0efb02a 100644\r
+--- a/test/test-lib.el\r
++++ b/test/test-lib.el\r
+@@ -89,7 +89,9 @@ nothing."\r
+ (defmacro notmuch-test-run (&rest body)\r
+   "Evaluate a BODY of test expressions and output the result."\r
+   `(with-temp-buffer\r
+-     (let ((result (progn ,@body)))\r
++     (let ((buffer (current-buffer))\r
++         (result (progn ,@body)))\r
++       (switch-to-buffer buffer)\r
+        (insert (if (stringp result)\r
+                  result\r
+                (prin1-to-string result)))\r
+-- \r
+1.7.8.3\r
+\r