Return-Path: <jani@nikula.org>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 2BEED431FDE
	for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:31:06 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: -0.7
X-Spam-Level: 
X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
	tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id MUhPq-jvKWIm for <notmuch@notmuchmail.org>;
	Sun,  3 Nov 2013 04:30:58 -0800 (PST)
Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com
 [74.125.83.49])	(using TLSv1 with cipher RC4-SHA (128/128 bits))	(No client
 certificate requested)	by olra.theworths.org (Postfix) with ESMTPS id
 10DCF431FDD	for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:30:57 -0800
 (PST)
Received: by mail-ee0-f49.google.com with SMTP id e52so582569eek.36
	for <notmuch@notmuchmail.org>; Sun, 03 Nov 2013 04:30:56 -0800 (PST)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20130820;
	h=x-gm-message-state:from:to:subject:in-reply-to:references
	:user-agent:date:message-id:mime-version:content-type;
	bh=yHa5jmlKXFoLJuZhmR5UDBip1wLE7XjnR5wgLzgoC1I=;
	b=MqI0a0DI0Ofm7wWLG5ya8knwXJf9Q5wS+rmZyIgdzA8i6l1eAXt4FMR7A8JxgYhjR+
	UuqsGtnFZ+9w+cYO/iwcpPqXMJ9UgEaJQy7oxFVBHIrTI+D76+KpC/zgiOpSNiZu9HXM
	akAZ6RSU/GkgxaOFZhMPvCMFITBrXEI7oOiwkirQOMLYo8kfMDe6V0HeVxHTh5WN3SGp
	r1ht4isp+cXX1CsTkf/NE9km56ywZ7AlRsCRH9eX3EcPFd7CD0VM9xyPKk3lAs1fujJk
	vWUVcwuQ60BnEyBl7XKK7AQL6znHEk3ayWNNbs52rXHKLPr9d4yprWxtC6lAwuwG25wq
	RmQQ==
X-Gm-Message-State:
 ALoCoQmBMx+vJw2ZSo6ebpW5dVNlQtM8172nq2fPjFQ4XM9RCKYDRdKK71+coQVMabNuOOZUOmcR
X-Received: by 10.14.89.7 with SMTP id b7mr12715722eef.10.1383481856904;
	Sun, 03 Nov 2013 04:30:56 -0800 (PST)
Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.
	[88.195.111.91])
	by mx.google.com with ESMTPSA id z1sm6887875eeo.14.2013.11.03.04.30.55
	for <multiple recipients>
	(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
	Sun, 03 Nov 2013 04:30:56 -0800 (PST)
From: Jani Nikula <jani@nikula.org>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: Re: [PATCH] test: fix compact backup / restore test
In-Reply-To: <1383350515-24320-1-git-send-email-david@tethera.net>
References: <1383350515-24320-1-git-send-email-david@tethera.net>
User-Agent: Notmuch/0.16+120~gfd733a4 (http://notmuchmail.org) Emacs/24.3.1
	(x86_64-pc-linux-gnu)
Date: Sun, 03 Nov 2013 14:30:54 +0200
Message-ID: <878ux5y8e9.fsf@nikula.org>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Nov 2013 12:31:06 -0000

On Sat, 02 Nov 2013, David Bremner <david@tethera.net> wrote:
> It was looking in completely the wrong place for the backup and the
> (test) xapian database. Unfortunately test_begin_subtest hides the
> relevant errors.

I included this, unchanged, in my series [1] that depends on it. It
makes no difference which one is pushed.

BR,
Jani.

[1] id:cover.1383481295.git.jani@nikula.org


> ---
>
> I found this bug because 
>
>   id:9ee3f2334a117b0a1b88650f44432423cbe95fd7.1383315568.git.jani@nikula.org
>
> did _not_ break any tests. Which was puzzling.
>
>  test/compact | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/test/compact b/test/compact
> index 5bb5cea..afab537 100755
> --- a/test/compact
> +++ b/test/compact
> @@ -19,10 +19,11 @@ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
>  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)
>  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"
>  
> -test_begin_subtest "Restoring backup"
> -rm -Rf ${TEST_TMPDIR}/mail/xapian
> -mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian
> +test_expect_success 'Restoring Backup' \
> +    'rm -Rf ${MAIL_DIR}/.notmuch/xapian &&
> +     mv ${MAIL_DIR}/xapian.old ${MAIL_DIR}/.notmuch/xapian'
>  
> +test_begin_subtest "Checking restored backup"
>  output=$(notmuch search \* | notmuch_search_sanitize)
>  test_expect_equal "$output" "\
>  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)
> -- 
> 1.8.4.rc3
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch