[Patch v6 02/14] test: add notmuch_search_files_sanitize and use it

diff --git a/8f/481d429aa58e35d31ab95c16d5b389d4f7c59e b/8f/481d429aa58e35d31ab95c16d5b389d4f7c59e
new file mode 100644 (file)
index 0000000..3d21a75
--- /dev/null
+++ b/8f/481d429aa58e35d31ab95c16d5b389d4f7c59e
@@ -0,0 +1,129 @@
+Return-Path: <bremner@tethera.net>\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 457ED431FD5\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:02:44 -0700 (PDT)\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 ZnYbzCwrZlbu for <notmuch@notmuchmail.org>;\r
+       Tue, 11 Mar 2014 16:02:42 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 5DC65431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 11 Mar 2014 16:02:28 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1WNVgp-0001vt-Sc; Tue, 11 Mar 2014 20:02:27 -0300\r
+Received: (nullmailer pid 25843 invoked by uid 1000); Tue, 11 Mar 2014\r
+       23:01:45 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v6 02/14] test: add notmuch_search_files_sanitize and use it\r
+Date: Tue, 11 Mar 2014 20:01:28 -0300\r
+Message-Id: <1394578900-25618-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.3\r
+In-Reply-To: <1394578900-25618-1-git-send-email-david@tethera.net>\r
+References: <1394578900-25618-1-git-send-email-david@tethera.net>\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: Tue, 11 Mar 2014 23:02:44 -0000\r
+\r
+From: Jani Nikula <jani@nikula.org>\r
+\r
+We do this in a lot of places, so make it a helper in the test-lib.\r
+---\r
+ test/T090-search-output.sh           | 8 ++++----\r
+ test/T370-search-folder-coherence.sh | 2 +-\r
+ test/test-lib.sh                     | 5 +++++\r
+ 3 files changed, 10 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/test/T090-search-output.sh b/test/T090-search-output.sh\r
+index 86544ac..a8ab920 100755\r
+--- a/test/T090-search-output.sh\r
++++ b/test/T090-search-output.sh\r
+@@ -181,7 +181,7 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--output=files"\r
+-notmuch search --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
++notmuch search --output=files '*' | notmuch_search_files_sanitize >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ MAIL_DIR/cur/52:2,\r
+ MAIL_DIR/cur/53:2,\r
+@@ -240,7 +240,7 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--output=files --duplicate=1"\r
+-notmuch search --output=files --duplicate=1 '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
++notmuch search --output=files --duplicate=1 '*' | notmuch_search_files_sanitize >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ MAIL_DIR/cur/52:2,\r
+ MAIL_DIR/cur/53:2,\r
+@@ -298,7 +298,7 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--output=files --format=json"\r
+-notmuch search --format=json --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
++notmuch search --format=json --output=files '*' | notmuch_search_files_sanitize >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ ["MAIL_DIR/cur/52:2,",\r
+ "MAIL_DIR/cur/53:2,",\r
+@@ -357,7 +357,7 @@ EOF\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "--output=files --format=json --duplicate=2"\r
+-notmuch search --format=json --output=files --duplicate=2 '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
++notmuch search --format=json --output=files --duplicate=2 '*' | notmuch_search_files_sanitize >OUTPUT\r
+ cat <<EOF >EXPECTED\r
+ ["MAIL_DIR/cur/51:2,"]\r
+ EOF\r
+diff --git a/test/T370-search-folder-coherence.sh b/test/T370-search-folder-coherence.sh\r
+index 3f6ec76..5e72a6c 100755\r
+--- a/test/T370-search-folder-coherence.sh\r
++++ b/test/T370-search-folder-coherence.sh\r
+@@ -27,7 +27,7 @@ cat <<EOF >EXPECTED\r
+ MAIL_DIR/msg-001\r
+ MAIL_DIR/spam/msg-001\r
+ EOF\r
+-notmuch search --output=files id:$id_x | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
++notmuch search --output=files id:$id_x | notmuch_search_files_sanitize >OUTPUT\r
+ test_expect_equal_file OUTPUT EXPECTED\r
+ \r
+ test_begin_subtest "Test matches folder:spam"\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 9824bb6..8697d6a 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -667,6 +667,11 @@ notmuch_search_sanitize ()\r
+     perl -pe 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/'\r
+ }\r
+ \r
++notmuch_search_files_sanitize()\r
++{\r
++    sed -e "s,$MAIL_DIR,MAIL_DIR,"\r
++}\r
++\r
+ NOTMUCH_SHOW_FILENAME_SQUELCH='s,filename:.*/mail,filename:/XXX/mail,'\r
+ notmuch_show_sanitize ()\r
+ {\r
+-- \r
+1.8.5.3\r
+\r