[Patch v2.5 4/4] test/insert: check that indexing errors are accepted with --keep

diff --git a/2e/ef0d1f88f32b5e04cc56644cee653bbda308c4 b/2e/ef0d1f88f32b5e04cc56644cee653bbda308c4
new file mode 100644 (file)
index 0000000..4c3fa53
--- /dev/null
+++ b/2e/ef0d1f88f32b5e04cc56644cee653bbda308c4
@@ -0,0 +1,74 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 56202431FC2\r
+       for <notmuch@notmuchmail.org>; Fri,  3 Oct 2014 14:19:53 -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 00Sk0PPnA4Ql for <notmuch@notmuchmail.org>;\r
+       Fri,  3 Oct 2014 14:19:48 -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 1D167431FC0\r
+       for <notmuch@notmuchmail.org>; Fri,  3 Oct 2014 14:19:41 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1XaAGK-0000LV-Ni; Fri, 03 Oct 2014 18:19:40 -0300\r
+Received: (nullmailer pid 21181 invoked by uid 1000); Fri, 03 Oct 2014\r
+       21:19:08 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2.5 4/4] test/insert: check that indexing errors are\r
+       accepted with --keep\r
+Date: Fri,  3 Oct 2014 23:19:00 +0200\r
+Message-Id: <1412371140-21051-5-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.0\r
+In-Reply-To: <1412371140-21051-1-git-send-email-david@tethera.net>\r
+References: <1412371140-21051-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: Fri, 03 Oct 2014 21:19:53 -0000\r
+\r
+This is overkill for the current code path, but should provide some\r
+robustness for future changes in error handling.\r
+---\r
+ test/T070-insert.sh | 5 +++++\r
+ 1 file changed, 5 insertions(+)\r
+\r
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
+index be8060e..80a22c1 100755\r
+--- a/test/T070-insert.sh\r
++++ b/test/T070-insert.sh\r
+@@ -202,6 +202,11 @@ test_begin_subtest "error exit when add_message returns $code"\r
+ gdb --batch-silent --return-child-result -x index-file-$code.gdb \\r
+     --args notmuch insert  < $gen_msg_filename\r
+ test_expect_equal $? 1\r
++\r
++test_begin_subtest "success exit with --keep when add_message returns $code"\r
++gdb --batch-silent --return-child-result -x index-file-$code.gdb \\r
++    --args notmuch insert --keep  < $gen_msg_filename\r
++test_expect_equal $? 0\r
+ done\r
+ \r
+ test_done\r
+-- \r
+2.1.0\r
+\r