From: Mark Walters Date: Sat, 14 Dec 2013 23:44:36 +0000 (+0000) Subject: [PATCH 5/5] test: make test_emacs call post-command-hook X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9fca23d6541452ad25fc838419fb85e0761adf1d;p=notmuch-archives.git [PATCH 5/5] test: make test_emacs call post-command-hook --- diff --git a/d9/34791909402f6fa74d3acab846bf990c1506f2 b/d9/34791909402f6fa74d3acab846bf990c1506f2 new file mode 100644 index 000000000..2d51c6031 --- /dev/null +++ b/d9/34791909402f6fa74d3acab846bf990c1506f2 @@ -0,0 +1,127 @@ +Return-Path: +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 38955431FD8 + for ; Sat, 14 Dec 2013 15:45:08 -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=disabled +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 Yya3LrJQrG+s for ; + Sat, 14 Dec 2013 15:45:03 -0800 (PST) +Received: from mail-we0-f175.google.com (mail-we0-f175.google.com + [74.125.82.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 419B2431FDA + for ; Sat, 14 Dec 2013 15:44:56 -0800 (PST) +Received: by mail-we0-f175.google.com with SMTP id t60so3220031wes.20 + for ; Sat, 14 Dec 2013 15:44:55 -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=VGFoHppb2PupiO9PHS8abdFum/Jxn5E1XqJHuFaDmlnYltqdYpK/xdUinlUenVJ4HI + eZKr0l+YXRivrhLtzWt9eR51iI+wdwDiWEE2PqxZx+S7q1QyDs+VrThMdbXj8infKhsb + A+9hsSKf6WfI4wNpcWCVUqgENyWQXdrsJ2u62UCNc0EJJvi13P+wRFQ9lcTqo1j1AHYE + IicvKV7cKa+u4zcYofO5LVZ06/FOnCmqJKKnCXxjzjVTn9DnVbh1SGHaUfKwfaGmU6rh + eTccGEHCaOvT9uo8ojeNSYqq0nmZTCyiXDCeiS5jGcNhM+U/UyRJyY3rVeIi8rRp+NZA + h8lQ== +X-Received: by 10.180.188.100 with SMTP id fz4mr7977704wic.57.1387064695191; + Sat, 14 Dec 2013 15:44:55 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPSA id w20sm11109685wia.5.2013.12.14.15.44.54 + for + (version=TLSv1.2 cipher=RC4-SHA bits=128/128); + Sat, 14 Dec 2013 15:44:54 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 5/5] test: make test_emacs call post-command-hook +Date: Sat, 14 Dec 2013 23:44:36 +0000 +Message-Id: <1387064676-15508-6-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1387064676-15508-1-git-send-email-markwalters1009@gmail.com> +References: <1387064676-15508-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." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 14 Dec 2013 23:45:08 -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 +