From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id CC506431FB6 for ; Fri, 9 Mar 2012 00:24:25 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[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 PD36ThVEUoly for ; Fri, 9 Mar 2012 00:24:25 -0800 (PST) Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id E7B82431FAE for ; Fri, 9 Mar 2012 00:24:24 -0800 (PST) Received: by lahc1 with SMTP id c1so1461737lah.26 for ; Fri, 09 Mar 2012 00:24:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:in-reply-to:references:user-agent:date:message-id :mime-version:content-type:x-gm-message-state; bh=Vx5txwyr+NxGJca3COSR/enwrJm5Rwns75lCWeN9PTE=; b=f25j03GQBVJoHgHpt4tUQwR5yBUpiQw2PtG1FHvuGTdTaxTxkqucmNyl8eaSVp1sya KMhzlFjtAa9j1Moyd8CcM1XEXszeNPJNyTlZTFvbCJrl0vp53PflMpe4c+t5ZjtR68aD NtIpwNH7ZPUpBE6KDlj4n3hDPAaHrvwCOxBYJAcwECXjM+eKwDegx9cZqaNCvYyb8gsW yEaonsyqpP/z8hWGytoz8UmM/5JJ+K0jnGjrL5XjQjnH2pmzkiXvxPiGJ06R3JB9X+ml LJrbUqAnJBydxSyB8dhdeoOfVehZaNe8e36Itm6yGNjlAhHR13E1E4JgrcDIiFr9VB4k Eq8A== Received: by 10.112.87.225 with SMTP id bb1mr451713lbb.59.1331281461803; Fri, 09 Mar 2012 00:24:21 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi. [84.248.80.253]) by mx.google.com with ESMTPS id hv2sm5591916lbb.9.2012.03.09.00.24.19 (version=SSLv3 cipher=OTHER); Fri, 09 Mar 2012 00:24:20 -0800 (PST) From: Jani Nikula To: Dmitry Kurochkin , notmuch@notmuchmail.org Subject: Re: [PATCH 2/2] test: use subtest name for generated message subject by default In-Reply-To: <1327961195-4204-2-git-send-email-dmitry.kurochkin@gmail.com> References: <1327961195-4204-1-git-send-email-dmitry.kurochkin@gmail.com> <1327961195-4204-2-git-send-email-dmitry.kurochkin@gmail.com> User-Agent: Notmuch/0.11.1+295~g780f284 (http://notmuchmail.org) Emacs/23.3.1 (i686-pc-linux-gnu) Date: Fri, 09 Mar 2012 10:24:17 +0200 Message-ID: <87ipie89n2.fsf@nikula.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Gm-Message-State: ALoCoQkeHRZAKO6jbPqu/2YiOwXzehR11mRE9Hv0woG2LJJeTlW0uTtnPtYuvoTivsZG2Qb+LPpU 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: Fri, 09 Mar 2012 08:24:25 -0000 Hi Dmitry, I tagged this notmuch::stale as it no longer cleanly applies to master. BR, Jani. On Tue, 31 Jan 2012 02:06:35 +0400, Dmitry Kurochkin wrote: > Before the change, messages generated by generate_message() used "Test > message #N" for default subject where N is the generated messages > counter. Since message subject is commonly present in expected > results, there is a chance of breaking other tests when a new > generate_message() call is added. The patch changes default subject > value for generated messages to subtest name if it is available. If > subtest name is not available (i.e. message is generated during test > initialization), the old default value is used (in this case it is > fine to have the counter in the subject). > > Another benefit of this change is a sane default value for subject in > generated messages, which would allow to simplify code like: > > test_begin_subtest "test for a cool feature" > add_message [subject]="message for test for a cool feature" > --- > test/encoding | 2 +- > test/search-folder-coherence | 2 +- > test/test-lib.sh | 6 +++++- > 3 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/test/encoding b/test/encoding > index 33259c1..dbaceb0 100755 > --- a/test/encoding > +++ b/test/encoding > @@ -9,7 +9,7 @@ output=$(notmuch show id:${gen_msg_id} 2>&1 | notmuch_show_sanitize) > test_expect_equal "$output" " message{ id:msg-001@notmuch-test-suite depth:0 match:1 filename:/XXX/mail/msg-001 > header{ > Notmuch Test Suite (2001-01-05) (inbox unread) > -Subject: Test message #1 > +Subject: Message with text of unknown charset > From: Notmuch Test Suite > To: Notmuch Test Suite > Date: Fri, 05 Jan 2001 15:43:57 +0000 > diff --git a/test/search-folder-coherence b/test/search-folder-coherence > index f8119cb..3f6ec76 100755 > --- a/test/search-folder-coherence > +++ b/test/search-folder-coherence > @@ -32,7 +32,7 @@ test_expect_equal_file OUTPUT EXPECTED > > test_begin_subtest "Test matches folder:spam" > output=$(notmuch search folder:spam) > -test_expect_equal "$output" "thread:0000000000000001 2001-01-05 [1/1] Notmuch Test Suite; Test message #1 (inbox unread)" > +test_expect_equal "$output" "thread:0000000000000001 2001-01-05 [1/1] Notmuch Test Suite; Single new message (inbox unread)" > > test_begin_subtest "Remove folder:spam copy of email" > rm $dir/spam/$(basename $file_x) > diff --git a/test/test-lib.sh b/test/test-lib.sh > index 8158328..94efdc1 100644 > --- a/test/test-lib.sh > +++ b/test/test-lib.sh > @@ -318,7 +318,11 @@ generate_message () > fi > > if [ -z "${template[subject]}" ]; then > - template[subject]="Test message #${gen_msg_cnt}" > + if [ -n "$test_subtest_name" ]; then > + template[subject]="$test_subtest_name" > + else > + template[subject]="Test message #${gen_msg_cnt}" > + fi > fi > > if [ -z "${template[date]}" ]; then > -- > 1.7.8.3 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch