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

diff --git a/c0/0663d596afb2f26c3df8dfe6b806eabbeb7381 b/c0/0663d596afb2f26c3df8dfe6b806eabbeb7381
new file mode 100644 (file)
index 0000000..07df587
--- /dev/null
+++ b/c0/0663d596afb2f26c3df8dfe6b806eabbeb7381
@@ -0,0 +1,98 @@
+Return-Path: <tomi.ollila@iki.fi>\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 B8297431FC9\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 06:26:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 YSVHDyHGAW4B for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Nov 2013 06:26:05 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4FDAE431FDB\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Nov 2013 06:26:04 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 9CD8510005D;\r
+       Sat,  2 Nov 2013 15:25:57 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\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+119~g219c55f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sat, 02 Nov 2013 15:25:57 +0200\r
+Message-ID: <m2li172avu.fsf@guru.guru-group.fi>\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: Sat, 02 Nov 2013 13:26:12 -0000\r
+\r
+On Sat, Nov 02 2013, David Bremner <david@tethera.net> wrote:\r
+\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
+\r
+LGTM. It took me a while noticing that also ${TEST_TMPDIR}\r
+was changed to ${MAIL_DIR}\r
+\r
+Tomi\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