[PATCH 2/2] test: add nontrivial test for restore --accumulate.

diff --git a/6d/9efb5808256487cb3a3c9a98e277f9f7ef16a0 b/6d/9efb5808256487cb3a3c9a98e277f9f7ef16a0
new file mode 100644 (file)
index 0000000..673048c
--- /dev/null
+++ b/6d/9efb5808256487cb3a3c9a98e277f9f7ef16a0
@@ -0,0 +1,89 @@
+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 9019E431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Nov 2012 06:35:31 -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 NSAfzGDEjQJq for <notmuch@notmuchmail.org>;\r
+       Sat, 17 Nov 2012 06:35:29 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id CE228431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 17 Nov 2012 06:35:29 -0800 (PST)\r
+Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.89.108] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TZjSy-0000oU-Se; Sat, 17 Nov 2012 10:34:16 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1TZjPv-00024q-A4; Sat, 17 Nov 2012 10:30:43 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] test: add nontrivial test for restore --accumulate.\r
+Date: Sat, 17 Nov 2012 10:30:31 -0400\r
+Message-Id: <1353162631-7947-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1353162631-7947-1-git-send-email-david@tethera.net>\r
+References: <8762552dre.fsf@betacantrips.com>\r
+       <1353162631-7947-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\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: Sat, 17 Nov 2012 14:35:31 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+It seems we have never tested the case that restore --accumulate\r
+actually adds tags. I noticed this when I started optimizing and no\r
+tests failed.\r
+\r
+The bracketing with "restore --input=dump.expected" are to make sure\r
+we start in a known state, and we leave the database in a known state\r
+for the next test.\r
+---\r
+ test/dump-restore |    7 +++++++\r
+ 1 file changed, 7 insertions(+)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index 7acf7fe..b05399c 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -49,6 +49,13 @@ test_expect_success 'Accumulate with no tags' \\r
+   notmuch dump > dump.actual &&\r
+   test_cmp dump.expected dump.actual'\r
+ \r
++test_expect_success 'Accumulate with new tags' \\r
++  'notmuch restore --input=dump.expected &&\r
++  notmuch restore --accumulate --input=dump-ABC_DEF.expected &&\r
++  notmuch dump >  OUTPUT.$test_count &&\r
++  notmuch restore --input=dump.expected &&\r
++  test_cmp dump-ABC_DEF.expected OUTPUT.$test_count'\r
++\r
+ # notmuch restore currently only considers the first argument.\r
+ test_expect_success 'Invalid restore invocation' \\r
+   'test_must_fail notmuch restore --input=dump.expected another_one'\r
+-- \r
+1.7.10.4\r
+\r