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 7AA7B431FAF
\r
6 for <notmuch@notmuchmail.org>; Fri, 16 Nov 2012 04:32:42 -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 jzUROatlj3PV for <notmuch@notmuchmail.org>;
\r
16 Fri, 16 Nov 2012 04:32:41 -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 B2C6B431FBC
\r
21 for <notmuch@notmuchmail.org>; Fri, 16 Nov 2012 04:32:41 -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 1TZL66-0000uO-Lv; Fri, 16 Nov 2012 08:32:39 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1TZL61-0006av-4u; Fri, 16 Nov 2012 08:32:33 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH] test: add nontrivial test for restore --accumulate.
\r
34 Date: Fri, 16 Nov 2012 08:31:19 -0400
\r
35 Message-Id: <1353069079-25270-1-git-send-email-david@tethera.net>
\r
36 X-Mailer: git-send-email 1.7.10.4
\r
38 Cc: David Bremner <bremner@debian.org>
\r
39 X-BeenThere: notmuch@notmuchmail.org
\r
40 X-Mailman-Version: 2.1.13
\r
42 List-Id: "Use and development of the notmuch mail system."
\r
43 <notmuch.notmuchmail.org>
\r
44 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
45 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
46 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
47 List-Post: <mailto:notmuch@notmuchmail.org>
\r
48 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
49 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
51 X-List-Received-Date: Fri, 16 Nov 2012 12:32:42 -0000
\r
53 From: David Bremner <bremner@debian.org>
\r
55 It seems we have never tested the case that restore --accumulate
\r
56 actually adds tags. I noticed this when I started optimizing and no
\r
59 I also had to modify the next test. Perhaps a seperate patch could
\r
60 make these tests more independent of the previous ones.
\r
62 test/dump-restore | 14 ++++++++------
\r
63 1 file changed, 8 insertions(+), 6 deletions(-)
\r
65 diff --git a/test/dump-restore b/test/dump-restore
\r
66 index f25f7cf..ca7a730 100755
\r
67 --- a/test/dump-restore
\r
68 +++ b/test/dump-restore
\r
69 @@ -29,18 +29,20 @@ test_expect_success 'Accumulate original tags' \
\r
70 notmuch dump > dump.actual &&
\r
71 test_cmp dump-ABC_DEF.expected dump.actual'
\r
73 -test_expect_success 'Restoring original tags' \
\r
74 - 'notmuch restore --input=dump.expected &&
\r
75 - notmuch dump > dump.actual &&
\r
76 - test_cmp dump.expected dump.actual'
\r
78 test_expect_success 'Restore with nothing to do' \
\r
79 'notmuch restore < dump.expected &&
\r
80 notmuch dump > dump.actual &&
\r
81 test_cmp dump.expected dump.actual'
\r
83 +test_expect_success 'Accumulate with changes' \
\r
84 + 'notmuch restore --input=dump.expected &&
\r
85 + notmuch restore --accumulate --input=dump-ABC_DEF.expected &&
\r
86 + notmuch dump > OUTPUT.$test_count &&
\r
87 + test_cmp dump-ABC_DEF.expected OUTPUT.$test_count'
\r
89 test_expect_success 'Restore with nothing to do, II' \
\r
90 - 'notmuch restore --accumulate --input=dump.expected &&
\r
91 + 'notmuch restore --input=dump.expected &&
\r
92 + notmuch restore --accumulate --input=dump.expected &&
\r
93 notmuch dump > dump.actual &&
\r
94 test_cmp dump.expected dump.actual'
\r