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 B8297431FC9
\r
6 for <notmuch@notmuchmail.org>; Sat, 2 Nov 2013 06:26:10 -0700 (PDT)
\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 YSVHDyHGAW4B for <notmuch@notmuchmail.org>;
\r
16 Sat, 2 Nov 2013 06:26:05 -0700 (PDT)
\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 4FDAE431FDB
\r
19 for <notmuch@notmuchmail.org>; Sat, 2 Nov 2013 06:26:04 -0700 (PDT)
\r
20 Received: from guru.guru-group.fi (localhost [IPv6:::1])
\r
21 by guru.guru-group.fi (Postfix) with ESMTP id 9CD8510005D;
\r
22 Sat, 2 Nov 2013 15:25:57 +0200 (EET)
\r
23 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
24 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
\r
25 Subject: Re: [PATCH] test: fix compact backup / restore test
\r
26 In-Reply-To: <1383350515-24320-1-git-send-email-david@tethera.net>
\r
27 References: <1383350515-24320-1-git-send-email-david@tethera.net>
\r
28 User-Agent: Notmuch/0.16+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1
\r
29 (x86_64-unknown-linux-gnu)
\r
30 X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
\r
31 $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
\r
32 !)g;OY^,BjTbr)Np:%c_o'jj,Z
\r
33 Date: Sat, 02 Nov 2013 15:25:57 +0200
\r
34 Message-ID: <m2li172avu.fsf@guru.guru-group.fi>
\r
36 Content-Type: text/plain
\r
37 X-BeenThere: notmuch@notmuchmail.org
\r
38 X-Mailman-Version: 2.1.13
\r
40 List-Id: "Use and development of the notmuch mail system."
\r
41 <notmuch.notmuchmail.org>
\r
42 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
43 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
44 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
45 List-Post: <mailto:notmuch@notmuchmail.org>
\r
46 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
47 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
49 X-List-Received-Date: Sat, 02 Nov 2013 13:26:12 -0000
\r
51 On Sat, Nov 02 2013, David Bremner <david@tethera.net> wrote:
\r
53 > It was looking in completely the wrong place for the backup and the
\r
54 > (test) xapian database. Unfortunately test_begin_subtest hides the
\r
58 LGTM. It took me a while noticing that also ${TEST_TMPDIR}
\r
59 was changed to ${MAIL_DIR}
\r
64 > I found this bug because
\r
66 > id:9ee3f2334a117b0a1b88650f44432423cbe95fd7.1383315568.git.jani@nikula.org
\r
68 > did _not_ break any tests. Which was puzzling.
\r
70 > test/compact | 7 ++++---
\r
71 > 1 file changed, 4 insertions(+), 3 deletions(-)
\r
73 > diff --git a/test/compact b/test/compact
\r
74 > index 5bb5cea..afab537 100755
\r
75 > --- a/test/compact
\r
76 > +++ b/test/compact
\r
77 > @@ -19,10 +19,11 @@ thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
\r
78 > thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)
\r
79 > thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"
\r
81 > -test_begin_subtest "Restoring backup"
\r
82 > -rm -Rf ${TEST_TMPDIR}/mail/xapian
\r
83 > -mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian
\r
84 > +test_expect_success 'Restoring Backup' \
\r
85 > + 'rm -Rf ${MAIL_DIR}/.notmuch/xapian &&
\r
86 > + mv ${MAIL_DIR}/xapian.old ${MAIL_DIR}/.notmuch/xapian'
\r
88 > +test_begin_subtest "Checking restored backup"
\r
89 > output=$(notmuch search \* | notmuch_search_sanitize)
\r
90 > test_expect_equal "$output" "\
\r
91 > thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
\r
95 > _______________________________________________
\r
96 > notmuch mailing list
\r
97 > notmuch@notmuchmail.org
\r
98 > http://notmuchmail.org/mailman/listinfo/notmuch
\r