1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 435DE431FD5
\r
6 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 13:20:46 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id DiW8pwdo7Wc2 for <notmuch@notmuchmail.org>;
\r
16 Sat, 24 Nov 2012 13:20:45 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 0CC53431FB6
\r
21 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 13:20:34 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034089108.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.89.108] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1TcN9N-0006SU-AB; Sat, 24 Nov 2012 17:20:33 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TcN9H-0008DS-RY; Sat, 24 Nov 2012 17:20:27 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v2 14/17] test: update dump-restore roundtripping test for
\r
35 Date: Sat, 24 Nov 2012 17:20:14 -0400
\r
36 Message-Id: <1353792017-31459-15-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1353792017-31459-1-git-send-email-david@tethera.net>
\r
39 References: <1353792017-31459-1-git-send-email-david@tethera.net>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Sat, 24 Nov 2012 21:20:46 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 Now we can actually round trip these crazy tags and and message ids.
\r
59 hex-xcode is no longer needed as it's built in.
\r
61 test/dump-restore | 13 +++++++------
\r
62 1 file changed, 7 insertions(+), 6 deletions(-)
\r
64 diff --git a/test/dump-restore b/test/dump-restore
\r
65 index a2204fb..e08b656 100755
\r
66 --- a/test/dump-restore
\r
67 +++ b/test/dump-restore
\r
68 @@ -85,13 +85,14 @@ test_begin_subtest "dump --output=outfile -- from:cworth"
\r
69 notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth
\r
70 test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
\r
73 test_expect_success 'roundtripping random message-ids and tags' \
\r
74 - 'test_subtest_known_broken &&
\r
75 - ${TEST_DIRECTORY}/random-corpus --num-messages=10 --config-path=${NOTMUCH_CONFIG} &&
\r
76 - notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > EXPECTED.$test_count &&
\r
77 + '${TEST_DIRECTORY}/random-corpus --num-messages=100 --config-path=${NOTMUCH_CONFIG} &&
\r
78 + notmuch dump --format=batch-tag | sort > EXPECTED.$test_count &&
\r
79 notmuch tag -random-corpus tag:random-corpus &&
\r
80 - ${TEST_DIRECTORY}/hex-xcode --direction=decode < EXPECTED.$test_count | notmuch restore 2>/dev/null &&
\r
81 - notmuch dump | ${TEST_DIRECTORY}/hex-xcode --direction=encode > OUTPUT.$test_count &&
\r
82 + notmuch restore --format=batch-tag --input=EXPECTED.$test_count &&
\r
83 + notmuch dump --format=batch-tag | sort > OUTPUT.$test_count &&
\r
84 test_cmp EXPECTED.$test_count OUTPUT.$test_count'
\r
88 +# Note the database is "poisoned" for sup format at this point.
\r