From: Tomi Ollila Date: Fri, 30 Nov 2012 07:29:20 +0000 (+0200) Subject: Re: [PATCH] test: add test for notmuch tag --batch option X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a7dde4da3ae3a58bc6eff1cecf99f4c31329ef8e;p=notmuch-archives.git Re: [PATCH] test: add test for notmuch tag --batch option --- diff --git a/3e/676687185732f52361b48d539720473f91415a b/3e/676687185732f52361b48d539720473f91415a new file mode 100644 index 000000000..e79d7f1c0 --- /dev/null +++ b/3e/676687185732f52361b48d539720473f91415a @@ -0,0 +1,155 @@ +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 09DC1431FBC + for ; Thu, 29 Nov 2012 23:29:30 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 5gy9m94wfx1J for ; + Thu, 29 Nov 2012 23:29:25 -0800 (PST) +Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) + by olra.theworths.org (Postfix) with ESMTP id F0335431FAF + for ; Thu, 29 Nov 2012 23:29:24 -0800 (PST) +Received: from guru.guru-group.fi (localhost [IPv6:::1]) + by guru.guru-group.fi (Postfix) with ESMTP id E419D1000E5; + Fri, 30 Nov 2012 09:29:20 +0200 (EET) +From: Tomi Ollila +To: david@tethera.net, notmuch@notmuchmail.org +Subject: Re: [PATCH] test: add test for notmuch tag --batch option +In-Reply-To: <1354248720-11899-1-git-send-email-david@tethera.net> +References: <87pq31i9g1.fsf@qmul.ac.uk> + <1354248720-11899-1-git-send-email-david@tethera.net> +User-Agent: Notmuch/0.14+116~g29fcdb5 (http://notmuchmail.org) Emacs/24.2.1 + (x86_64-unknown-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain +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, 30 Nov 2012 07:29:30 -0000 + +On Fri, Nov 30 2012, david@tethera.net wrote: + +> From: Jani Nikula +> +> Basic test of functionality, along with all combinations of options. +> +> Modified extensively by David Bremner +> +> The choice of @ as a tag is intended to be non-alphanumeric, but still +> not too much trouble in the shell and in the old sup dump/restore format. +> --- +> +> Mark: good catch. +> +> I decided to save restore the tags rather than have +> multiple input and output files here. +> +> test/tagging | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ +> 1 file changed, 50 insertions(+) +> +> diff --git a/test/tagging b/test/tagging +> index 980ff92..75552e8 100755 +> --- a/test/tagging +> +++ b/test/tagging +> @@ -46,6 +46,56 @@ test_expect_equal "$output" "\ +> thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (:\" inbox tag1 unread) +> thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag4 unread)" +> +> +test_begin_subtest "--batch" +> +notmuch tag --batch < +# %20 is a space in tag +> +-:"%20 -tag1 +tag5 +tag6 -- One +> ++tag1 -tag1 -tag4 +tag4 -- Two +> +-tag6 One +> ++tag5 Two +> +EOF +> +output=$(notmuch search \* | notmuch_search_sanitize) +> +test_expect_equal "$output" "\ +> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag5 unread) +> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag5 unread)" +> + +> +cat > batch.in < +# %20 is a space in tag +> ++%40 -tag5 +tag6 -- One +> ++tag1 -tag1 -tag4 +tag4 -- Two +> +-tag5 +tag6 Two +> +EOF +> + +> +cat > batch.expected < +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (@ inbox tag6 unread) +> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag6 unread) +> +EOF +> + +> +test_begin_subtest "--input" +> +notmuch dump > backup.tags.$test_count +> +notmuch tag --input=batch.in +> +notmuch search \* | notmuch_search_sanitize > OUTPUT.$test_count +> +notmuch restore < backup.tags.$test_count +> +test_expect_equal_file batch.expected OUTPUT.$test_count + +2 things for all of these test_expect_equal_file ...:s + +Generally, argument order is OUTPUT EXPECTED (the diff is harder to grasp +-- but changing the diff order in test_expect_equal_file is pretty easy... +(& I have some patches in preparation for that...) + +In case of failure. test_expect_equal_file does + + if diff -q "$file1" "$file2" >/dev/null ; then + test_ok_ "$test_subtest_name" + else + testname=$this_test.$test_count + cp "$file1" "$testname.$basename1" + cp "$file2" "$testname.$basename2" + +i.e. the $test_count is already in the files -- in these +cases that is duplicated... + +Tomi + + +> +test_begin_subtest "--batch --input" +> +notmuch dump > backup.tags.$test_count +> +notmuch tag --batch --input=batch.in +> +notmuch search \* | notmuch_search_sanitize > OUTPUT.$test_count +> +notmuch restore < backup.tags.$test_count +> +test_expect_equal_file batch.expected OUTPUT.$test_count +> + +> +test_begin_subtest "--batch, blank lines and comments" +> +notmuch dump | sort > EXPECTED.$test_count +> +notmuch tag --batch < +# this line is a comment; the next has only white space +> + +> + +> +# the previous line is empty +> +EOF +> +notmuch dump | sort > OUTPUT.$test_count +> +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count +> + +> test_expect_code 1 "Empty tag names" 'notmuch tag + One' +> +> test_expect_code 1 "Tag name beginning with -" 'notmuch tag +- One' +> -- +> 1.7.10.4