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 9019E431FB6
\r
6 for <notmuch@notmuchmail.org>; Sat, 17 Nov 2012 06:35:31 -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 NSAfzGDEjQJq for <notmuch@notmuchmail.org>;
\r
16 Sat, 17 Nov 2012 06:35:29 -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 CE228431FAE
\r
21 for <notmuch@notmuchmail.org>; Sat, 17 Nov 2012 06:35:29 -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 1TZjSy-0000oU-Se; Sat, 17 Nov 2012 10:34:16 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TZjPv-00024q-A4; Sat, 17 Nov 2012 10:30:43 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 2/2] test: add nontrivial test for restore --accumulate.
\r
34 Date: Sat, 17 Nov 2012 10:30:31 -0400
\r
35 Message-Id: <1353162631-7947-2-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
37 In-Reply-To: <1353162631-7947-1-git-send-email-david@tethera.net>
\r
38 References: <8762552dre.fsf@betacantrips.com>
\r
39 <1353162631-7947-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, 17 Nov 2012 14:35:31 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 It seems we have never tested the case that restore --accumulate
\r
59 actually adds tags. I noticed this when I started optimizing and no
\r
62 The bracketing with "restore --input=dump.expected" are to make sure
\r
63 we start in a known state, and we leave the database in a known state
\r
66 test/dump-restore | 7 +++++++
\r
67 1 file changed, 7 insertions(+)
\r
69 diff --git a/test/dump-restore b/test/dump-restore
\r
70 index 7acf7fe..b05399c 100755
\r
71 --- a/test/dump-restore
\r
72 +++ b/test/dump-restore
\r
73 @@ -49,6 +49,13 @@ test_expect_success 'Accumulate with no tags' \
\r
74 notmuch dump > dump.actual &&
\r
75 test_cmp dump.expected dump.actual'
\r
77 +test_expect_success 'Accumulate with new tags' \
\r
78 + 'notmuch restore --input=dump.expected &&
\r
79 + notmuch restore --accumulate --input=dump-ABC_DEF.expected &&
\r
80 + notmuch dump > OUTPUT.$test_count &&
\r
81 + notmuch restore --input=dump.expected &&
\r
82 + test_cmp dump-ABC_DEF.expected OUTPUT.$test_count'
\r
84 # notmuch restore currently only considers the first argument.
\r
85 test_expect_success 'Invalid restore invocation' \
\r
86 'test_must_fail notmuch restore --input=dump.expected another_one'
\r