--- /dev/null
+Return-Path: <amthrax@drake.mit.edu>\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 BFDA8431FB6\r
+ for <notmuch@notmuchmail.org>; Mon, 7 May 2012 11:09:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 RZ7Jh59hReQj for <notmuch@notmuchmail.org>;\r
+ Mon, 7 May 2012 11:09:56 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id 3D905431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 7 May 2012 11:09:56 -0700 (PDT)\r
+X-AuditID: 12074425-b7f966d0000008b6-da-4fa80ff33b85\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id A4.0B.02230.3FF08AF4; Mon, 7 May 2012 14:09:55 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q47I9th6010136; \r
+ Mon, 7 May 2012 14:09:55 -0400\r
+Received: from drake.mit.edu (26-4-166.dynamic.csail.mit.edu [18.26.4.166])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q47I9sCv003111\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Mon, 7 May 2012 14:09:55 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1SRSNe-0003zX-DL; Mon, 07 May 2012 14:09:54 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] test: Test notmuch new with a broken symlink\r
+Date: Mon, 7 May 2012 14:09:45 -0400\r
+Message-Id: <1336414186-15293-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1336414186-15293-1-git-send-email-amdragon@mit.edu>\r
+References: <1336414186-15293-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6novuZf4W/QddqA4vrN2cyW8w4v4vF\r
+ gcnj2apbzB7Ljv5kDGCK4rJJSc3JLEst0rdL4Mr4/O4gc8Fv1oo5HVeYGxi/s3QxcnJICJhI\r
+ vJjaxARhi0lcuLeerYuRi0NIYB+jxJsVDcwQznpGiWmfd0BljjFJ/F/wjAXCmc8oMevVEnaQ\r
+ fjYBDYlt+5czgtgiAtISO+/OZgWxmQU8JQ58mwYWFxZwlPi55BWYzSKgKtGyfgIbiM0r4CDR\r
+ c7WRHeIOeYmn9/uA4hwcnED1h7/LgoSFgEpuLTnEPIGRfwEjwypG2ZTcKt3cxMyc4tRk3eLk\r
+ xLy81CJdC73czBK91JTSTYzgUHJR3cE44ZDSIUYBDkYlHl6lF8v9hVgTy4orcw8xSnIwKYny\r
+ ruVd4S/El5SfUpmRWJwRX1Sak1p8iFGCg1lJhPfNd6By3pTEyqrUonyYlDQHi5I4r6bWOz8h\r
+ gfTEktTs1NSC1CKYrAwHh5IE700+oKGCRanpqRVpmTklCGkmDk6Q4TxAw2+D1PAWFyTmFmem\r
+ Q+RPMSpKifO+BkkIgCQySvPgemGx/opRHOgVYV5jYOQL8QDTBFz3K6DBTECDNz9bBjK4JBEh\r
+ JdXAuCLkT+rD+TeCci03dUrP+Lb90J3si+v23L2xLXvK/RlpNiXLur8eiMpZtVbk4k3Bl9N2\r
+ n/tVYClWrhFXYeuv0WA+J0fC41pCsVTOZ9+Uef8FpZTFviwzPePZJ3DwTPlZ8x2xaSqtN85k\r
+ bsuQ6iix1NQ79P6unt83U5Gmi6veH/6mc6IwU+DQXyWW4oxEQy3mouJEAEn/14rQAgAA\r
+Cc: Vladimir Marek <vlmarek@volny.cz>\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, 07 May 2012 18:09:56 -0000\r
+\r
+---\r
+ test/new | 10 ++++++++++\r
+ 1 file changed, 10 insertions(+)\r
+\r
+diff --git a/test/new b/test/new\r
+index 99f9913..26253db 100755\r
+--- a/test/new\r
++++ b/test/new\r
+@@ -136,6 +136,16 @@ output=$(NOTMUCH_NEW)\r
+ test_expect_equal "$output" "Added 1 new message to the database."\r
+ \r
+ \r
++test_begin_subtest "Broken symlink aborts"\r
++ln -s does-not-exist "${MAIL_DIR}/broken"\r
++output=$(NOTMUCH_NEW 2>&1)\r
++test_expect_equal "$output" \\r
++"Error reading directory /run/shm/nm/tmp.new/mail/broken: No such file or directory\r
++Note: A fatal error was encountered: Something went wrong trying to read or write a file\r
++No new mail."\r
++rm "${MAIL_DIR}/broken"\r
++\r
++\r
+ test_begin_subtest "New two-level directory"\r
+ \r
+ generate_message [dir]=two/levels\r
+-- \r
+1.7.10\r
+\r