Return-Path: <markwalters1009@gmail.com>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 360E5431FDE
	for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 15:53:40 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0.201
X-Spam-Level: 
X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
	RCVD_IN_DNSWL_LOW=-0.7] autolearn=unavailable
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id c0RVyKP4VTCA for <notmuch@notmuchmail.org>;
	Sat, 14 Dec 2013 15:53:40 -0800 (PST)
Received: from mail-wi0-f180.google.com (mail-wi0-f180.google.com
	[209.85.212.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id D01E9431FD7
	for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 15:53:34 -0800 (PST)
Received: by mail-wi0-f180.google.com with SMTP id hn9so732772wib.1
	for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 15:53:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:in-reply-to:references;
	bh=+efGbVtifOD5XXoCSmyTsITT1MQwKHo3bAWLFVvq/tM=;
	b=kz9EySK29SS9e7BOE+XiPLeCILpKBHfNF9Gkl1qajXwUS4NH0mmZQluXr0Co8NaMNi
	jEZXwTXklRpYeWrb3+5nqq3X0gJo8AhrTx724BY2nzPotxNnS+lVyuUwIqkUhflo7Kwf
	HsenjyoUyS8dLnSshkOq8myZxxFfZHcJIMC3cECRinDjgaV457vZMYPw4wv3PQFJuhIB
	ZABV5bCmpizLzd13bUjfSnnfqK+GUX98Zzrx7FxqTmUVxdDVw1CEshtWiKsGOm74RsRr
	Svv5ZtbqdA9qWAvGWymEarHl+I9euCHjbMkckEbgg3H6vLtCnFNoQERK9wQ/lyDPguVM
	tF0Q==
X-Received: by 10.194.109.68 with SMTP id hq4mr7856797wjb.12.1387065213749;
	Sat, 14 Dec 2013 15:53:33 -0800 (PST)
Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])
	by mx.google.com with ESMTPSA id
	mz10sm11180290wic.2.2013.12.14.15.53.32 for <multiple recipients>
	(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
	Sat, 14 Dec 2013 15:53:33 -0800 (PST)
From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v2 1/5] test: make test_emacs call post-command-hook
Date: Sat, 14 Dec 2013 23:53:13 +0000
Message-Id: <1387065197-15776-2-git-send-email-markwalters1009@gmail.com>
X-Mailer: git-send-email 1.7.9.1
In-Reply-To: <1387065197-15776-1-git-send-email-markwalters1009@gmail.com>
References: <1387065197-15776-1-git-send-email-markwalters1009@gmail.com>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Dec 2013 23:53:40 -0000

The unread/read changes will use the post-command-hook. test_emacs
does not call the post-command-hook. This adds a notmuch-test-progn
which takes a list of commands as argument and executes them in turn
but runs the post-command-hook after each one.

The caller can batch operations (ie to stop post-command-hook from
being interleaved) by wrapping the batch of operations inside a progn.

We also explicitly run the post-command-hook before getting the output
from a test; this makes sense as this will be a place the user would
be seeing the information.
---
 test/test-lib.el |   12 ++++++++++++
 test/test-lib.sh |    2 +-
 2 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/test/test-lib.el b/test/test-lib.el
index d26b49f..1c9e224 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -52,11 +52,13 @@
 
 (defun test-output (&optional filename)
   "Save current buffer to file FILENAME.  Default FILENAME is OUTPUT."
+  (notmuch-post-command)
   (write-region (point-min) (point-max) (or filename "OUTPUT")))
 
 (defun test-visible-output (&optional filename)
   "Save visible text in current buffer to file FILENAME.  Default
 FILENAME is OUTPUT."
+  (notmuch-post-command)
   (let ((text (visible-buffer-string)))
     (with-temp-file (or filename "OUTPUT") (insert text))))
 
@@ -162,3 +164,13 @@ nothing."
 
      (t
       (notmuch-test-report-unexpected output expected)))))
+
+(defun notmuch-post-command ()
+  (run-hooks 'post-command-hook))
+
+(defun notmuch-test-progn (body)
+  (let (form
+	ret)
+    (dolist (form body ret)
+      (setq ret (eval form))
+      (notmuch-post-command))))
diff --git a/test/test-lib.sh b/test/test-lib.sh
index d8e0d91..e7833fc 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -1075,7 +1075,7 @@ test_emacs () {
 	rm -f OUTPUT
 	touch OUTPUT
 
-	${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(progn $@)"
+	${TEST_EMACSCLIENT} --socket-name="$EMACS_SERVER" --eval "(notmuch-test-progn '($@))"
 }
 
 test_python() {
-- 
1.7.9.1