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 8AFC3429E36 for ; Wed, 25 Jan 2012 09:54:18 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.799 X-Spam-Level: X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.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 evPb2IEqxj2J for ; Wed, 25 Jan 2012 09:54:17 -0800 (PST) Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 7FAAC431FBC for ; Wed, 25 Jan 2012 09:54:17 -0800 (PST) Received: by bkbzt19 with SMTP id zt19so3707541bkb.26 for ; Wed, 25 Jan 2012 09:54:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:subject:in-reply-to:references:user-agent:date:message-id :mime-version:content-type; bh=xVhSOIagv9ebAcH2NGHWWZQ1K5OwTXydi8Iah9Ytv9Q=; b=kSRU78cbydctMIIrCkM+bNe6D7NpFDnzw0gslfSUX+UFjkzI36f9/L3J7CIYDEOBvl dXvGLbQU4eNfux1LmEOLDt7EaFe4Q88BfsXDkDbJLp84kWGuBV8AFq8nsdC4rdmjvBk3 R9YiZWM4EtAahcngowG9PF88AFMcHj/DZFvJ4= Received: by 10.204.153.27 with SMTP id i27mr7512253bkw.81.1327514056074; Wed, 25 Jan 2012 09:54:16 -0800 (PST) Received: from localhost ([91.144.186.21]) by mx.google.com with ESMTPS id t17sm2615195bke.6.2012.01.25.09.54.14 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 25 Jan 2012 09:54:15 -0800 (PST) From: Dmitry Kurochkin To: David Edmondson , notmuch@notmuchmail.org Subject: Re: [PATCH 3/4 v2] test: Add test for Original Message hiding at point-min. In-Reply-To: <1327506328-22126-4-git-send-email-dme@dme.org> References: <1327503908-17226-1-git-send-email-dme@dme.org> <1327506328-22126-1-git-send-email-dme@dme.org> <1327506328-22126-4-git-send-email-dme@dme.org> User-Agent: Notmuch/0.11+116~ge6e10b8 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Wed, 25 Jan 2012 21:53:08 +0400 Message-ID: <87liovhdob.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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: Wed, 25 Jan 2012 17:54:18 -0000 On Wed, 25 Jan 2012 15:45:27 +0000, David Edmondson wrote: > --- > test/emacs-original-message-hiding.el | 15 +++++++++++++++ > test/emacs-original-message-hiding.sh | 20 ++++++++++++++++++++ > test/notmuch-test | 1 + > 3 files changed, 36 insertions(+), 0 deletions(-) > create mode 100644 test/emacs-original-message-hiding.el > create mode 100755 test/emacs-original-message-hiding.sh > > diff --git a/test/emacs-original-message-hiding.el b/test/emacs-original-message-hiding.el > new file mode 100644 > index 0000000..bbacbeb > --- /dev/null > +++ b/test/emacs-original-message-hiding.el > @@ -0,0 +1,15 @@ > +(defun notmuch-test-original-message-hiding () > + (let ((notmuch-show-insert-text/plain-hook '(notmuch-wash-excerpt-citations)) Do we have to override the default value here? I thought notmuch-wash-excerpt-citations was enabled by default. > + (expected "\ > +Sender (2010-01-05) (inbox) > +Subject: hiding an Original Message > +To: mailinglist@notmuchmail.org > +Date: Tue, 05 Jan 2010 15:43:56 -0000 > + > +[ 2-line hidden original message. Click/Enter to show. ] > + > +") > + output) > + (notmuch-show "id:\"test_message@test.org\"") > + (setq output (visible-buffer-string)) > + (notmuch-test-expect-equal output expected))) IMO writing the test in lisp does not give any benefit in this case. Quite the opposite: a simple test is split in two files and becomes more complex. But since we accepted this way of writing tests and you seem to prefer it, I would not argue about changing it. > diff --git a/test/emacs-original-message-hiding.sh b/test/emacs-original-message-hiding.sh > new file mode 100755 > index 0000000..01cf98d > --- /dev/null > +++ b/test/emacs-original-message-hiding.sh Let's rename this file to something a bit more general, e.g. emacs-message-hiding. Then we can put new tests (and move all existing!) related to hiding message parts into it. > @@ -0,0 +1,20 @@ > +#!/usr/bin/env bash > + > +test_description="emacs Original Message hiding" > +. test-lib.sh > + > +test_begin_subtest "Hiding an Original Message region at point-min" > +add_message \ > + '[id]="test_message@test.org"' \ The message-id should be more unique to avoid collisions with other tests. IMO deriving message-id from the test description is a good practice. Also, consider assigning it to a variable and using it instead of the string. Since part of the test is in lisp, it is tricky to use this variable in it. Perhaps we should pass it as a parameter to notmuch-test-original-message-hiding? Or just do not bother and use string constants :) Your choice. Regards, Dmitry > + '[from]="Sender "' \ > + '[to]=mailinglist@notmuchmail.org' \ > + '[subject]="hiding an Original Message"' \ > + '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \ > + '[body]="-----Original Message----- > +Text here. > +"' > +test_subtest_known_broken > +test_emacs_expect_t \ > + '(load "emacs-original-message-hiding.el") (notmuch-test-original-message-hiding)' > + > +test_done > diff --git a/test/notmuch-test b/test/notmuch-test > index 3f1740c..af132fc 100755 > --- a/test/notmuch-test > +++ b/test/notmuch-test > @@ -54,6 +54,7 @@ TESTS=" > argument-parsing > emacs-test-functions.sh > emacs-address-cleaning.sh > + emacs-original-message-hiding.sh > " > TESTS=${NOTMUCH_TESTS:=$TESTS} > > -- > 1.7.8.3 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch