From: David Edmondson <dme@dme.org>
Date: Thu, 26 Jan 2012 07:19:38 +0000 (+0000)
Subject: test: `notmuch-test-run' should protect against buffer switching.
X-Git-Tag: debian/0.12_rc1-1~149
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=2f50524e27db2ca58f6543a2c73a5719d8d7f491;hp=c70c7f86b83601231bac94db8a6596a1d729ae24

test: `notmuch-test-run' should protect against buffer switching.

The body of the test may cause the current buffer to change. Ensure
that the output goes to the correct buffer by switching back before
inserting it.
---

diff --git a/test/test-lib.el b/test/test-lib.el
index 5b32e0ab..6271da22 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -92,7 +92,9 @@ nothing."
 (defmacro notmuch-test-run (&rest body)
   "Evaluate a BODY of test expressions and output the result."
   `(with-temp-buffer
-     (let ((result (progn ,@body)))
+     (let ((buffer (current-buffer))
+	   (result (progn ,@body)))
+       (switch-to-buffer buffer)
        (insert (if (stringp result)
 		   result
 		 (prin1-to-string result)))