From: Dmitry Kurochkin Date: Mon, 30 Jan 2012 22:06:35 +0000 (+0400) Subject: [PATCH 2/2] test: use subtest name for generated message subject by default X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dd1b5263b7f1ee625b9d251623f523795f8c76a7;p=notmuch-archives.git [PATCH 2/2] test: use subtest name for generated message subject by default --- diff --git a/02/b0c51e9a4866898f4f71ba4c3e940477300fdc b/02/b0c51e9a4866898f4f71ba4c3e940477300fdc new file mode 100644 index 000000000..06590c05e --- /dev/null +++ b/02/b0c51e9a4866898f4f71ba4c3e940477300fdc @@ -0,0 +1,138 @@ +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 7E8F1431E64 + for ; Mon, 30 Jan 2012 14:07:50 -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 PCoEc-+497Xx for ; + Mon, 30 Jan 2012 14:07:49 -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 A8AA4431FBC + for ; Mon, 30 Jan 2012 14:07:49 -0800 (PST) +Received: by mail-bk0-f53.google.com with SMTP id 11so1911694bke.26 + for ; Mon, 30 Jan 2012 14:07:49 -0800 (PST) +Received-SPF: pass (google.com: domain of dmitry.kurochkin@gmail.com + designates 10.204.152.145 as permitted sender) + client-ip=10.204.152.145; +Authentication-Results: mr.google.com; spf=pass (google.com: domain of + dmitry.kurochkin@gmail.com designates 10.204.152.145 as + permitted sender) smtp.mail=dmitry.kurochkin@gmail.com; + dkim=pass header.i=dmitry.kurochkin@gmail.com +Received: from mr.google.com ([10.204.152.145]) + by 10.204.152.145 with SMTP id g17mr10538015bkw.97.1327961269409 + (num_hops = 1); Mon, 30 Jan 2012 14:07:49 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; + bh=hwQzn4cLgMkdVaVefZITkYqmq0w/TNq/tgJVYEwf/3Y=; + b=HYi+6KQyXIaY3X2trHAuEyGWg7yJHyZ0ykAtkFDQ5yxVkEpWbLqUmjDWBL16YmH0Vo + y6eiPmJ+hgMxMbtlboMdwXfZM8rHVbSAN1a6o08VBmnz1xId3BcZk7pXSAEyzNgXJZmU + AqbO962HCpxOtaBjQqZELMJ4AFDtYEOgPUw4M= +Received: by 10.204.152.145 with SMTP id g17mr9149983bkw.97.1327961269326; + Mon, 30 Jan 2012 14:07:49 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id ez5sm40482935bkc.15.2012.01.30.14.07.48 + (version=TLSv1/SSLv3 cipher=OTHER); + Mon, 30 Jan 2012 14:07:48 -0800 (PST) +From: Dmitry Kurochkin +To: notmuch@notmuchmail.org +Subject: [PATCH 2/2] test: use subtest name for generated message subject by + default +Date: Tue, 31 Jan 2012 02:06:35 +0400 +Message-Id: <1327961195-4204-2-git-send-email-dmitry.kurochkin@gmail.com> +X-Mailer: git-send-email 1.7.8.3 +In-Reply-To: <1327961195-4204-1-git-send-email-dmitry.kurochkin@gmail.com> +References: <1327961195-4204-1-git-send-email-dmitry.kurochkin@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: Mon, 30 Jan 2012 22:07:50 -0000 + +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 +