From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 57B0E431FDB for ; Sun, 3 Nov 2013 04:25:06 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" 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 55azqNHXLKqj for ; Sun, 3 Nov 2013 04:24:58 -0800 (PST) Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 06449431FBF for ; Sun, 3 Nov 2013 04:24:57 -0800 (PST) Received: by mail-ea0-f182.google.com with SMTP id o10so2860479eaj.41 for ; Sun, 03 Nov 2013 04:24: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:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=M8hdHdm5wZHwMa4yo5WrS+f65b/rngIY0VvDfg9gaU0=; b=f2uQ77lBwUXwwjUeV26ykaH+374lzSsfkxSY7UorW2Qeq00MqP5H0xgFV02vQrXROy 12grG4yUJh/czdIsxenIkihy3c8uCCVGdejxOhMkGniQvfHCS7b4Eh+LHL7zWJpmtZZR bVu8r7jKgYYqnTp/pmiyQF0C/eWAy2oPP6U5eJXtk+YISEATy+pEyfySVimwMK2xp3Cr vlm2Mcy63P4MTMMF4j+Znsddyjam2iMhKQk9TQXHG2wBmH7Wx3iaNx3GVu/BSBykOyjf pUxXYtG0FK8ZvbSdA2cTpyz9lXiIG7/V0LiLdc/2Xf6Fs/l3KJwCoDKni9dPBRs/Z13r qhTg== X-Gm-Message-State: ALoCoQlRD8siigFU1BNUxlaUvBArSxVa/gg1e2YgskroU/9lyH1vmnpuVIavj/IjvrzNjk4vegBL X-Received: by 10.14.48.14 with SMTP id u14mr145382eeb.74.1383481496822; Sun, 03 Nov 2013 04:24:56 -0800 (PST) Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi. [88.195.111.91]) by mx.google.com with ESMTPSA id x47sm32772966eea.16.2013.11.03.04.24.55 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 03 Nov 2013 04:24:56 -0800 (PST) From: Jani Nikula To: notmuch@notmuchmail.org Subject: [PATCH v2 01/11] test: fix compact backup / restore test Date: Sun, 3 Nov 2013 14:24:41 +0200 Message-Id: <877a8e845940b35ab0ec226b8e0915ed56275611.1383481295.git.jani@nikula.org> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: References: In-Reply-To: References: X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 12:25:06 -0000 From: David Bremner It was looking in completely the wrong place for the backup and the (test) xapian database. Unfortunately test_begin_subtest hides the relevant errors. --- 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