--- /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 ECCC8431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 13:20:34 -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 JUiyFZ5Jpjzv for <notmuch@notmuchmail.org>;\r
+ Sat, 24 Nov 2012 13:20:34 -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 A30DC431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 13:20:32 -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 1TcN9L-0006SM-T8; Sat, 24 Nov 2012 17:20:32 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+ (envelope-from <bremner@tethera.net>)\r
+ id 1TcN9G-0008Co-EI; Sat, 24 Nov 2012 17:20:26 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 06/17] test: add broken roundtrip test\r
+Date: Sat, 24 Nov 2012 17:20:06 -0400\r
+Message-Id: <1353792017-31459-7-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1353792017-31459-1-git-send-email-david@tethera.net>\r
+References: <1353792017-31459-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, 24 Nov 2012 21:20:35 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+We demonstrate the current notmuch restore parser being confused by\r
+message-id's and tags containing non alpha numeric characters\r
+(particularly space and parentheses are problematic because they are\r
+not escaped by notmuch dump).\r
+\r
+We save the files as hex escaped on disk so that the output from the\r
+failing test will not confuse the terminal emulator of people running\r
+the test.\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 b05399c..a2204fb 100755\r
+--- a/test/dump-restore\r
++++ b/test/dump-restore\r
+@@ -85,4 +85,13 @@ test_begin_subtest "dump --output=outfile -- from:cworth"\r
+ notmuch dump --output=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 --num-messages=10 --config-path=${NOTMUCH_CONFIG} &&\r
++ notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > EXPECTED.$test_count &&\r
++ notmuch tag -random-corpus tag:random-corpus &&\r
++ ${TEST_DIRECTORY}/hex-xcode --direction=decode < EXPECTED.$test_count | notmuch restore 2>/dev/null &&\r
++ notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > OUTPUT.$test_count &&\r
++ test_cmp EXPECTED.$test_count OUTPUT.$test_count'\r
++\r
+ test_done\r
+-- \r
+1.7.10.4\r
+\r