--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 09DC1431FBC\r
+ for <notmuch@notmuchmail.org>; Thu, 29 Nov 2012 23:29:30 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 5gy9m94wfx1J for <notmuch@notmuchmail.org>;\r
+ Thu, 29 Nov 2012 23:29:25 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id F0335431FAF\r
+ for <notmuch@notmuchmail.org>; Thu, 29 Nov 2012 23:29:24 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id E419D1000E5;\r
+ Fri, 30 Nov 2012 09:29:20 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: add test for notmuch tag --batch option\r
+In-Reply-To: <1354248720-11899-1-git-send-email-david@tethera.net>\r
+References: <87pq31i9g1.fsf@qmul.ac.uk>\r
+ <1354248720-11899-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.14+116~g29fcdb5 (http://notmuchmail.org) Emacs/24.2.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 30 Nov 2012 09:29:20 +0200\r
+Message-ID: <m2fw3rlfan.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 30 Nov 2012 07:29:30 -0000\r
+\r
+On Fri, Nov 30 2012, david@tethera.net wrote:\r
+\r
+> From: Jani Nikula <jani@nikula.org>\r
+>\r
+> Basic test of functionality, along with all combinations of options.\r
+>\r
+> Modified extensively by David Bremner <david@tethera.net>\r
+>\r
+> The choice of @ as a tag is intended to be non-alphanumeric, but still\r
+> not too much trouble in the shell and in the old sup dump/restore format.\r
+> ---\r
+>\r
+> Mark: good catch. \r
+>\r
+> I decided to save restore the tags rather than have\r
+> multiple input and output files here.\r
+>\r
+> test/tagging | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++\r
+> 1 file changed, 50 insertions(+)\r
+>\r
+> diff --git a/test/tagging b/test/tagging\r
+> index 980ff92..75552e8 100755\r
+> --- a/test/tagging\r
+> +++ b/test/tagging\r
+> @@ -46,6 +46,56 @@ test_expect_equal "$output" "\\r
+> thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (:\" inbox tag1 unread)\r
+> thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag4 unread)"\r
+> \r
+> +test_begin_subtest "--batch"\r
+> +notmuch tag --batch <<EOF\r
+> +# %20 is a space in tag\r
+> +-:"%20 -tag1 +tag5 +tag6 -- One\r
+> ++tag1 -tag1 -tag4 +tag4 -- Two\r
+> +-tag6 One\r
+> ++tag5 Two\r
+> +EOF\r
+> +output=$(notmuch search \* | notmuch_search_sanitize)\r
+> +test_expect_equal "$output" "\\r
+> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag5 unread)\r
+> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag5 unread)"\r
+> +\r
+> +cat > batch.in <<EOF\r
+> +# %20 is a space in tag\r
+> ++%40 -tag5 +tag6 -- One\r
+> ++tag1 -tag1 -tag4 +tag4 -- Two\r
+> +-tag5 +tag6 Two\r
+> +EOF\r
+> +\r
+> +cat > batch.expected <<EOF\r
+> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (@ inbox tag6 unread)\r
+> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag6 unread)\r
+> +EOF\r
+> +\r
+> +test_begin_subtest "--input"\r
+> +notmuch dump > backup.tags.$test_count\r
+> +notmuch tag --input=batch.in\r
+> +notmuch search \* | notmuch_search_sanitize > OUTPUT.$test_count\r
+> +notmuch restore < backup.tags.$test_count\r
+> +test_expect_equal_file batch.expected OUTPUT.$test_count\r
+\r
+2 things for all of these test_expect_equal_file ...:s\r
+\r
+Generally, argument order is OUTPUT EXPECTED (the diff is harder to grasp\r
+-- but changing the diff order in test_expect_equal_file is pretty easy...\r
+(& I have some patches in preparation for that...)\r
+\r
+In case of failure. test_expect_equal_file does\r
+\r
+ if diff -q "$file1" "$file2" >/dev/null ; then\r
+ test_ok_ "$test_subtest_name"\r
+ else\r
+ testname=$this_test.$test_count\r
+ cp "$file1" "$testname.$basename1"\r
+ cp "$file2" "$testname.$basename2"\r
+\r
+i.e. the $test_count is already in the files -- in these\r
+cases that is duplicated...\r
+\r
+Tomi\r
+\r
+\r
+> +test_begin_subtest "--batch --input"\r
+> +notmuch dump > backup.tags.$test_count\r
+> +notmuch tag --batch --input=batch.in\r
+> +notmuch search \* | notmuch_search_sanitize > OUTPUT.$test_count\r
+> +notmuch restore < backup.tags.$test_count\r
+> +test_expect_equal_file batch.expected OUTPUT.$test_count\r
+> +\r
+> +test_begin_subtest "--batch, blank lines and comments"\r
+> +notmuch dump | sort > EXPECTED.$test_count\r
+> +notmuch tag --batch <<EOF\r
+> +# this line is a comment; the next has only white space\r
+> + \r
+> +\r
+> +# the previous line is empty\r
+> +EOF\r
+> +notmuch dump | sort > OUTPUT.$test_count\r
+> +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +\r
+> test_expect_code 1 "Empty tag names" 'notmuch tag + One'\r
+> \r
+> test_expect_code 1 "Tag name beginning with -" 'notmuch tag +- One'\r
+> -- \r
+> 1.7.10.4\r
projects / notmuch-archives.git / commitdiff