1 Return-Path: <tomi.ollila@iki.fi>
\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 B3448431FAF
\r
6 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 15:17:13 -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 aepCCQpYIGQR for <notmuch@notmuchmail.org>;
\r
16 Sat, 24 Nov 2012 15:17:13 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
\r
18 by olra.theworths.org (Postfix) with ESMTP id 19526431FAE
\r
19 for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 15:17:13 -0800 (PST)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 6921210010B;
\r
22 Sun, 25 Nov 2012 01:17:11 +0200 (EET)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: david@tethera.net, notmuch@notmuchmail.org
\r
25 Subject: Re: [Patch v2 14/17] test: update dump-restore roundtripping test for
\r
27 In-Reply-To: <1353792017-31459-15-git-send-email-david@tethera.net>
\r
28 References: <1353792017-31459-1-git-send-email-david@tethera.net>
\r
29 <1353792017-31459-15-git-send-email-david@tethera.net>
\r
30 User-Agent: Notmuch/0.14+84~g8a199bf (http://notmuchmail.org) Emacs/24.2.1
\r
31 (x86_64-unknown-linux-gnu)
\r
32 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
33 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
34 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
35 Date: Sun, 25 Nov 2012 01:17:11 +0200
\r
36 Message-ID: <m2zk26ioaw.fsf@guru.guru-group.fi>
\r
38 Content-Type: text/plain
\r
39 Cc: David Bremner <bremner@debian.org>
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Sat, 24 Nov 2012 23:17:13 -0000
\r
54 On Sat, Nov 24 2012, david@tethera.net wrote:
\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 In most cases there is empty line before `test_done` -- also other
\r
89 unrelated whitespace changes disturb review (especially when one is
\r
93 > +# Note the database is "poisoned" for sup format at this point.
\r