--- /dev/null
+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 87ADB431FC9\r
+ for <notmuch@notmuchmail.org>; Sun, 5 Aug 2012 11:13:38 -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 xpVO+ywy-2Rq for <notmuch@notmuchmail.org>;\r
+ Sun, 5 Aug 2012 11:13:38 -0700 (PDT)\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 EE6B9431FC2\r
+ for <notmuch@notmuchmail.org>; Sun, 5 Aug 2012 11:13:37 -0700 (PDT)\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 1Sy5KV-0006XM-4I; Sun, 05 Aug 2012 15:13:35 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1Sy5KP-0005x9-LU; Sun, 05 Aug 2012 15:13:25 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] test: add broken roundtrip test\r
+Date: Sun, 5 Aug 2012 15:13:13 -0300\r
+Message-Id: <1344190393-22497-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1344190393-22497-1-git-send-email-david@tethera.net>\r
+References: <1344190393-22497-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: Sun, 05 Aug 2012 18:13:38 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+The output of test_cmp is redirected because it is pretty horrible,\r
+and tends to mess up terminals. When the test is no longer marked as\r
+broken, this redirection should be removed.\r
+---\r
+ test/dump-restore | 9 +++++++++\r
+ 1 file changed, 9 insertions(+)\r
+\r
+diff --git a/test/dump-restore b/test/dump-restore\r
+index 439e998..7979ebf 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -82,4 +82,13 @@ test_begin_subtest "dump outfile -- from:cworth"\r
+ notmuch dump dump-outfile-dash-inbox.actual -- from:cworth\r
+ test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual\r
+ \r
++test_expect_success 'roundtripping random message-ids and tags' \\r
++ 'test_subtest_known_broken &&\r
++ ${TEST_DIRECTORY}/random-corpus --config-path=${NOTMUCH_CONFIG} &&\r
++ notmuch dump > EXPECTED.$test_count &&\r
++ notmuch tag -random-corpus tag:random-corpus &&\r
++ notmuch restore < EXPECTED.$test_count 2>/dev/null &&\r
++ notmuch dump > OUTPUT.$test_count &&\r
++ test_cmp EXPECTED.$test_count OUTPUT.$test_count 1>/dev/null'\r
++\r
+ test_done\r
+-- \r
+1.7.10.4\r
+\r