1 Return-Path: <ethan.glasser.camp@gmail.com>
\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 69A17431FAF
\r
6 for <notmuch@notmuchmail.org>; Fri, 16 Nov 2012 17:56:50 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id VUvt9HKOOvx2 for <notmuch@notmuchmail.org>;
\r
17 Fri, 16 Nov 2012 17:56:49 -0800 (PST)
\r
18 Received: from mail-qa0-f53.google.com (mail-qa0-f53.google.com
\r
19 [209.85.216.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id A6D16431FAE
\r
22 for <notmuch@notmuchmail.org>; Fri, 16 Nov 2012 17:56:49 -0800 (PST)
\r
23 Received: by mail-qa0-f53.google.com with SMTP id k31so2683577qat.5
\r
24 for <notmuch@notmuchmail.org>; Fri, 16 Nov 2012 17:56:49 -0800 (PST)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:in-reply-to:references:user-agent:date
\r
27 :message-id:mime-version:content-type;
\r
28 bh=USAOoY4ZA7NJJqtATXMtOonR5K+fESYTO+z7z6vc9wI=;
\r
29 b=N31Bqzib1UEFfg3KRMoN5X9SRDQKkesThTAXjWm3wDosBApy8iHo9O8TfiwLknUBYt
\r
30 McXFNVNJEy8MDAENDFuJR+cXqaf73yISNWpAslihVqH+rvQZlAv09rCnQtcDzueNME/X
\r
31 7rCR06PeKgO/Ycvs956t+MCw92NG410BrObi6VjolkdLQdMvjuARe5Ty3lFb80KLFETM
\r
32 fnp5DBBDq6lDDwmwAtmTKeVtoYaLTEVX2+yAK9aip80ulj3iSQK/Nh7kYXpxzAPc1RYT
\r
33 SN+V5sk+FeFhd933WzBlOQW/4kH6MXJmvQHMB/BzTQABagADkEa2zKkB5v6VbP189n5n
\r
35 Received: by 10.224.177.74 with SMTP id bh10mr6194587qab.65.1353117408083;
\r
36 Fri, 16 Nov 2012 17:56:48 -0800 (PST)
\r
37 Received: from smtp.gmail.com ([66.114.71.21])
\r
38 by mx.google.com with ESMTPS id d5sm1852494qev.2.2012.11.16.17.56.46
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Fri, 16 Nov 2012 17:56:46 -0800 (PST)
\r
41 From: Ethan Glasser-Camp <ethan.glasser.camp@gmail.com>
\r
42 To: david@tethera.net, notmuch@notmuchmail.org
\r
43 Subject: Re: [PATCH] test: add nontrivial test for restore --accumulate.
\r
44 In-Reply-To: <1353069079-25270-1-git-send-email-david@tethera.net>
\r
45 References: <1353069079-25270-1-git-send-email-david@tethera.net>
\r
46 User-Agent: Notmuch/0.14+45~g6ea9330 (http://notmuchmail.org) Emacs/24.1.1
\r
47 (x86_64-pc-linux-gnu)
\r
48 Date: Fri, 16 Nov 2012 20:56:37 -0500
\r
49 Message-ID: <8762552dre.fsf@betacantrips.com>
\r
51 Content-Type: text/plain
\r
52 Cc: David Bremner <bremner@debian.org>
\r
53 X-BeenThere: notmuch@notmuchmail.org
\r
54 X-Mailman-Version: 2.1.13
\r
56 List-Id: "Use and development of the notmuch mail system."
\r
57 <notmuch.notmuchmail.org>
\r
58 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
60 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
61 List-Post: <mailto:notmuch@notmuchmail.org>
\r
62 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
63 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
64 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
65 X-List-Received-Date: Sat, 17 Nov 2012 01:56:50 -0000
\r
67 david@tethera.net writes:
\r
69 > From: David Bremner <bremner@debian.org>
\r
71 > It seems we have never tested the case that restore --accumulate
\r
72 > actually adds tags. I noticed this when I started optimizing and no
\r
75 > I also had to modify the next test. Perhaps a seperate patch could
\r
76 > make these tests more independent of the previous ones.
\r
78 > test/dump-restore | 14 ++++++++------
\r
79 > 1 file changed, 8 insertions(+), 6 deletions(-)
\r
81 > diff --git a/test/dump-restore b/test/dump-restore
\r
82 > index f25f7cf..ca7a730 100755
\r
83 > --- a/test/dump-restore
\r
84 > +++ b/test/dump-restore
\r
85 > @@ -29,18 +29,20 @@ test_expect_success 'Accumulate original tags' \
\r
86 > notmuch dump > dump.actual &&
\r
87 > test_cmp dump-ABC_DEF.expected dump.actual'
\r
89 > -test_expect_success 'Restoring original tags' \
\r
90 > - 'notmuch restore --input=dump.expected &&
\r
91 > - notmuch dump > dump.actual &&
\r
92 > - test_cmp dump.expected dump.actual'
\r
95 I guess you're removing this test because it just shows that restore can
\r
96 remove tags, and we already see that in earlier tests?
\r
98 > test_expect_success 'Restore with nothing to do' \
\r
99 > 'notmuch restore < dump.expected &&
\r
100 > notmuch dump > dump.actual &&
\r
101 > test_cmp dump.expected dump.actual'
\r
103 Maybe change the name of this test, as now it certainly does something?
\r
105 > +test_expect_success 'Accumulate with changes' \
\r
106 > + 'notmuch restore --input=dump.expected &&
\r
107 > + notmuch restore --accumulate --input=dump-ABC_DEF.expected &&
\r
108 > + notmuch dump > OUTPUT.$test_count &&
\r
109 > + test_cmp dump-ABC_DEF.expected OUTPUT.$test_count'
\r
111 Alignment? I think each line should start with two spaces.
\r
114 > test_expect_success 'Restore with nothing to do, II' \
\r
115 > - 'notmuch restore --accumulate --input=dump.expected &&
\r
116 > + 'notmuch restore --input=dump.expected &&
\r
117 > + notmuch restore --accumulate --input=dump.expected &&
\r
118 > notmuch dump > dump.actual &&
\r
119 > test_cmp dump.expected dump.actual'
\r
121 Maybe change the name? "Accumulate with nothing to do", for instance?
\r