[PATCH 1/6] test: update dump-restore to use redirection instead of filename args

diff --git a/4a/4b2322bcc08ea6cba8bb90995f8986e071d1c1 b/4a/4b2322bcc08ea6cba8bb90995f8986e071d1c1
new file mode 100644 (file)
index 0000000..8be49f5
--- /dev/null
+++ b/4a/4b2322bcc08ea6cba8bb90995f8986e071d1c1
@@ -0,0 +1,94 @@
+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 B5F89429E35\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Oct 2011 06:49:50 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[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 8F4rFEutWMUn for <notmuch@notmuchmail.org>;\r
+       Mon, 10 Oct 2011 06:49:49 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\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 2AC26429E32\r
+       for <notmuch@notmuchmail.org>; Mon, 10 Oct 2011 06:49:47 -0700 (PDT)\r
+Received: from zancas.localnet\r
+       (fctnnbsc36w-156034064058.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [156.34.64.58]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9ADngZ8010802\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Mon, 10 Oct 2011 10:49:43 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.76)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1RDGEg-0006fl-Dt; Mon, 10 Oct 2011 10:49:42 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/6] test: update dump-restore to use redirection instead of\r
+       filename args\r
+Date: Mon, 10 Oct 2011 10:49:16 -0300\r
+Message-Id: <1318254561-25386-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.6.3\r
+In-Reply-To: <1318254561-25386-1-git-send-email-david@tethera.net>\r
+References: <8739f2qhla.fsf@zancas.localnet>\r
+       <1318254561-25386-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\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: Mon, 10 Oct 2011 13:49:51 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+The idea here is that we want to deprecate the use of arguments to\r
+dump and restore to specify paths, since in particular we want to use\r
+the non-option arguments to dump to form a query.\r
+---\r
+ test/dump-restore |   10 +++++-----\r
+ 1 files changed, 5 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index a4de370..96c4f19 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -6,17 +6,17 @@ add_email_corpus\r
+ \r
+ test_expect_success "Dumping all tags" "generate_message &&\r
+ notmuch new &&\r
+-notmuch dump dump.expected"\r
++notmuch dump > dump.expected"\r
+ \r
+ test_begin_subtest "Clearing all tags"\r
+ sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected\r
+-notmuch restore clear.expected\r
+-notmuch dump clear.actual\r
++notmuch restore < clear.expected\r
++notmuch dump > clear.actual\r
+ test_expect_equal "$(< clear.actual)" "$(< clear.expected)"\r
+ \r
+ test_begin_subtest "Restoring original tags"\r
+-notmuch restore dump.expected\r
+-notmuch dump dump.actual\r
++notmuch restore < dump.expected\r
++notmuch dump > dump.actual\r
+ test_expect_equal "$(< dump.actual)" "$(< dump.expected)"\r
+ \r
+ test_expect_success "Restore with nothing to do" "notmuch restore dump.expected"\r
+-- \r
+1.7.6.3\r
+\r