Re: [PATCH] test: fix compact backup / restore test

diff --git a/e9/d8e4c2322bf2af5ff6c1baba47e4fa9239af3c b/e9/d8e4c2322bf2af5ff6c1baba47e4fa9239af3c
new file mode 100644 (file)
index 0000000..1af2a06
--- /dev/null
+++ b/e9/d8e4c2322bf2af5ff6c1baba47e4fa9239af3c
@@ -0,0 +1,120 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 2BEED431FDE\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:31:06 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id MUhPq-jvKWIm for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Nov 2013 04:30:58 -0800 (PST)\r
+Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com\r
+ [74.125.83.49])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 10DCF431FDD   for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:30:57 -0800\r
+ (PST)\r
+Received: by mail-ee0-f49.google.com with SMTP id e52so582569eek.36\r
+       for <notmuch@notmuchmail.org>; Sun, 03 Nov 2013 04:30:56 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=yHa5jmlKXFoLJuZhmR5UDBip1wLE7XjnR5wgLzgoC1I=;\r
+       b=MqI0a0DI0Ofm7wWLG5ya8knwXJf9Q5wS+rmZyIgdzA8i6l1eAXt4FMR7A8JxgYhjR+\r
+       UuqsGtnFZ+9w+cYO/iwcpPqXMJ9UgEaJQy7oxFVBHIrTI+D76+KpC/zgiOpSNiZu9HXM\r
+       akAZ6RSU/GkgxaOFZhMPvCMFITBrXEI7oOiwkirQOMLYo8kfMDe6V0HeVxHTh5WN3SGp\r
+       r1ht4isp+cXX1CsTkf/NE9km56ywZ7AlRsCRH9eX3EcPFd7CD0VM9xyPKk3lAs1fujJk\r
+       vWUVcwuQ60BnEyBl7XKK7AQL6znHEk3ayWNNbs52rXHKLPr9d4yprWxtC6lAwuwG25wq\r
+       RmQQ==\r
+X-Gm-Message-State:\r
+ ALoCoQmBMx+vJw2ZSo6ebpW5dVNlQtM8172nq2fPjFQ4XM9RCKYDRdKK71+coQVMabNuOOZUOmcR\r
+X-Received: by 10.14.89.7 with SMTP id b7mr12715722eef.10.1383481856904;\r
+       Sun, 03 Nov 2013 04:30:56 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id z1sm6887875eeo.14.2013.11.03.04.30.55\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 03 Nov 2013 04:30:56 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] test: fix compact backup / restore test\r
+In-Reply-To: <1383350515-24320-1-git-send-email-david@tethera.net>\r
+References: <1383350515-24320-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.16+120~gfd733a4 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sun, 03 Nov 2013 14:30:54 +0200\r
+Message-ID: <878ux5y8e9.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 03 Nov 2013 12:31:06 -0000\r
+\r
+On Sat, 02 Nov 2013, David Bremner <david@tethera.net> wrote:\r
+> It was looking in completely the wrong place for the backup and the\r
+> (test) xapian database. Unfortunately test_begin_subtest hides the\r
+> relevant errors.\r
+\r
+I included this, unchanged, in my series [1] that depends on it. It\r
+makes no difference which one is pushed.\r
+\r
+BR,\r
+Jani.\r
+\r
+[1] id:cover.1383481295.git.jani@nikula.org\r
+\r
+\r
+> ---\r
+>\r
+> I found this bug because \r
+>\r
+>   id:9ee3f2334a117b0a1b88650f44432423cbe95fd7.1383315568.git.jani@nikula.org\r
+>\r
+> did _not_ break any tests. Which was puzzling.\r
+>\r
+>  test/compact | 7 ++++---\r
+>  1 file changed, 4 insertions(+), 3 deletions(-)\r
+>\r
+> diff --git a/test/compact b/test/compact\r
+> index 5bb5cea..afab537 100755\r
+> --- a/test/compact\r
+> +++ b/test/compact\r
+> @@ -19,10 +19,11 @@ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
+>  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)\r
+>  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"\r
+>  \r
+> -test_begin_subtest "Restoring backup"\r
+> -rm -Rf ${TEST_TMPDIR}/mail/xapian\r
+> -mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian\r
+> +test_expect_success 'Restoring Backup' \\r
+> +    'rm -Rf ${MAIL_DIR}/.notmuch/xapian &&\r
+> +     mv ${MAIL_DIR}/xapian.old ${MAIL_DIR}/.notmuch/xapian'\r
+>  \r
+> +test_begin_subtest "Checking restored backup"\r
+>  output=$(notmuch search \* | notmuch_search_sanitize)\r
+>  test_expect_equal "$output" "\\r
+>  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
+> -- \r
+> 1.8.4.rc3\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r