Re: [PATCH v2 3/4] test: notmuch search --format=text0

diff --git a/d7/7c0c31ec90cb190c4055e7382204d32791ac3f b/d7/7c0c31ec90cb190c4055e7382204d32791ac3f
new file mode 100644 (file)
index 0000000..5773293
--- /dev/null
+++ b/d7/7c0c31ec90cb190c4055e7382204d32791ac3f
@@ -0,0 +1,150 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 E5956431FC0\r
+       for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 00:17:55 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 3z31WxizrwEI for <notmuch@notmuchmail.org>;\r
+       Sun, 16 Dec 2012 00:17:55 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2ABB7431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 00:17:55 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1Tk9Q1-000093-9A; Sun, 16 Dec 2012 08:17:53 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1Tk9Q0-0004nv-Us; Sun, 16 Dec 2012 08:17:53 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2 3/4] test: notmuch search --format=text0\r
+In-Reply-To:\r
+ <5c881edb2803e613e8726f71fe86772d372b38a0.1355064714.git.jani@nikula.org>\r
+References: <cover.1355064714.git.jani@nikula.org>\r
+       <5c881edb2803e613e8726f71fe86772d372b38a0.1355064714.git.jani@nikula.org>\r
+User-Agent: Notmuch/0.14+155~g7edfdc3 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 16 Dec 2012 08:17:56 +0000\r
+Message-ID: <8738z6wguj.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: ab382be420668391e371ee7474e8f0e5 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Sun, 16 Dec 2012 08:17:56 -0000\r
+\r
+\r
+On Sun, 09 Dec 2012, Jani Nikula <jani@nikula.org> wrote:\r
+> ---\r
+>  test/text |   29 +++++++++++++++++++++++++++++\r
+>  1 file changed, 29 insertions(+)\r
+>\r
+> diff --git a/test/text b/test/text\r
+> index 428c89b..e003a66 100755\r
+> --- a/test/text\r
+> +++ b/test/text\r
+> @@ -52,4 +52,33 @@ output=3D$(notmuch search --format=3Dtext "t=C3=ABxt-s=\r
+earch-m=C3=A9ssage" | notmuch_search_s\r
+>  test_expect_equal "$output" \\r
+>  "thread:XXX   2000-01-01 [1/1] Notmuch Test Suite; text-search-utf8-body=\r
+-s=C3=BCbj=C3=A9ct (inbox unread)"\r
+>=20=20\r
+> +add_email_corpus\r
+> +\r
+> +test_begin_subtest "Search message tags: text0"\r
+> +cat <<EOF > EXPECTED.$test_count\r
+> +attachment inbox signed unread\r
+> +EOF\r
+> +notmuch search --format=3Dtext0 --output=3Dtags '*' | xargs -0 | notmuch=\r
+_search_sanitize > OUTPUT.$test_count\r
+> +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +\r
+> +test_begin_subtest "Compare text vs. text0 for threads"\r
+> +notmuch search --format=3Dtext --output=3Dthreads '*' | notmuch_search_s=\r
+anitize > EXPECTED.$test_count\r
+> +notmuch search --format=3Dtext0 --output=3Dthreads '*' | xargs -0 -L1 | =\r
+notmuch_search_sanitize > OUTPUT.$test_count\r
+> +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+\r
+Hi\r
+\r
+These xargs -0 -L1 tests almost pass with format=3Dtext (no zero) passed:\r
+the output only differs in one newline at the end. Would it be worth\r
+strengthening the test at all? I don't have any good suggestion but\r
+replacing the xargs with\r
+tr '\n\0' ' \n'\r
+seemed to give clearly different output in the two cases (and the test\r
+passes as it stands).\r
+\r
+OTOH maybe the test before is sufficient in that respect.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+> +\r
+> +test_begin_subtest "Compare text vs. text0 for messages"\r
+> +notmuch search --format=3Dtext --output=3Dmessages '*' | notmuch_search_=\r
+sanitize > EXPECTED.$test_count\r
+> +notmuch search --format=3Dtext0 --output=3Dmessages '*' | xargs -0 -L1 |=\r
+ notmuch_search_sanitize > OUTPUT.$test_count\r
+> +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +\r
+> +test_begin_subtest "Compare text vs. text0 for files"\r
+> +notmuch search --format=3Dtext --output=3Dfiles '*' | notmuch_search_san=\r
+itize > EXPECTED.$test_count\r
+> +notmuch search --format=3Dtext0 --output=3Dfiles '*' | xargs -0 -L1 | no=\r
+tmuch_search_sanitize > OUTPUT.$test_count\r
+> +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +\r
+> +test_begin_subtest "Compare text vs. text0 for tags"\r
+> +notmuch search --format=3Dtext --output=3Dtags '*' | notmuch_search_sani=\r
+tize > EXPECTED.$test_count\r
+> +notmuch search --format=3Dtext0 --output=3Dtags '*' | xargs -0 -L1 | not=\r
+much_search_sanitize > OUTPUT.$test_count\r
+> +test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +\r
+>  test_done\r
+> --=20\r
+> 1.7.10.4\r