e9/d8e4c2322bf2af5ff6c1baba47e4fa9239af3c

   1 Return-Path: <jani@nikula.org>\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 2BEED431FDE\r
   6         for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:31:06 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\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 MUhPq-jvKWIm for <notmuch@notmuchmail.org>;\r
  16         Sun,  3 Nov 2013 04:30:58 -0800 (PST)\r
  17 Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com\r
  18  [74.125.83.49])        (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
  19  certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
  20  10DCF431FDD    for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:30:57 -0800\r
  21  (PST)\r
  22 Received: by mail-ee0-f49.google.com with SMTP id e52so582569eek.36\r
  23         for <notmuch@notmuchmail.org>; Sun, 03 Nov 2013 04:30:56 -0800 (PST)\r
  24 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  25         d=1e100.net; s=20130820;\r
  26         h=x-gm-message-state:from:to:subject:in-reply-to:references\r
  27         :user-agent:date:message-id:mime-version:content-type;\r
  28         bh=yHa5jmlKXFoLJuZhmR5UDBip1wLE7XjnR5wgLzgoC1I=;\r
  29         b=MqI0a0DI0Ofm7wWLG5ya8knwXJf9Q5wS+rmZyIgdzA8i6l1eAXt4FMR7A8JxgYhjR+\r
  30         UuqsGtnFZ+9w+cYO/iwcpPqXMJ9UgEaJQy7oxFVBHIrTI+D76+KpC/zgiOpSNiZu9HXM\r
  31         akAZ6RSU/GkgxaOFZhMPvCMFITBrXEI7oOiwkirQOMLYo8kfMDe6V0HeVxHTh5WN3SGp\r
  32         r1ht4isp+cXX1CsTkf/NE9km56ywZ7AlRsCRH9eX3EcPFd7CD0VM9xyPKk3lAs1fujJk\r
  33         vWUVcwuQ60BnEyBl7XKK7AQL6znHEk3ayWNNbs52rXHKLPr9d4yprWxtC6lAwuwG25wq\r
  34         RmQQ==\r
  35 X-Gm-Message-State:\r
  36  ALoCoQmBMx+vJw2ZSo6ebpW5dVNlQtM8172nq2fPjFQ4XM9RCKYDRdKK71+coQVMabNuOOZUOmcR\r
  37 X-Received: by 10.14.89.7 with SMTP id b7mr12715722eef.10.1383481856904;\r
  38         Sun, 03 Nov 2013 04:30:56 -0800 (PST)\r
  39 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  40         [88.195.111.91])\r
  41         by mx.google.com with ESMTPSA id z1sm6887875eeo.14.2013.11.03.04.30.55\r
  42         for <multiple recipients>\r
  43         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  44         Sun, 03 Nov 2013 04:30:56 -0800 (PST)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
  47 Subject: Re: [PATCH] test: fix compact backup / restore test\r
  48 In-Reply-To: <1383350515-24320-1-git-send-email-david@tethera.net>\r
  49 References: <1383350515-24320-1-git-send-email-david@tethera.net>\r
  50 User-Agent: Notmuch/0.16+120~gfd733a4 (http://notmuchmail.org) Emacs/24.3.1\r
  51         (x86_64-pc-linux-gnu)\r
  52 Date: Sun, 03 Nov 2013 14:30:54 +0200\r
  53 Message-ID: <878ux5y8e9.fsf@nikula.org>\r
  54 MIME-Version: 1.0\r
  55 Content-Type: text/plain\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Sun, 03 Nov 2013 12:31:06 -0000\r
  69 \r
  70 On Sat, 02 Nov 2013, David Bremner <david@tethera.net> wrote:\r
  71 > It was looking in completely the wrong place for the backup and the\r
  72 > (test) xapian database. Unfortunately test_begin_subtest hides the\r
  73 > relevant errors.\r
  74 \r
  75 I included this, unchanged, in my series [1] that depends on it. It\r
  76 makes no difference which one is pushed.\r
  77 \r
  78 BR,\r
  79 Jani.\r
  80 \r
  81 [1] id:cover.1383481295.git.jani@nikula.org\r
  82 \r
  83 \r
  84 > ---\r
  85 >\r
  86 > I found this bug because \r
  87 >\r
  88 >   id:9ee3f2334a117b0a1b88650f44432423cbe95fd7.1383315568.git.jani@nikula.org\r
  89 >\r
  90 > did _not_ break any tests. Which was puzzling.\r
  91 >\r
  92 >  test/compact | 7 ++++---\r
  93 >  1 file changed, 4 insertions(+), 3 deletions(-)\r
  94 >\r
  95 > diff --git a/test/compact b/test/compact\r
  96 > index 5bb5cea..afab537 100755\r
  97 > --- a/test/compact\r
  98 > +++ b/test/compact\r
  99 > @@ -19,10 +19,11 @@ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
 100 >  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)\r
 101 >  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"\r
 102 >  \r
 103 > -test_begin_subtest "Restoring backup"\r
 104 > -rm -Rf ${TEST_TMPDIR}/mail/xapian\r
 105 > -mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian\r
 106 > +test_expect_success 'Restoring Backup' \\r
 107 > +    'rm -Rf ${MAIL_DIR}/.notmuch/xapian &&\r
 108 > +     mv ${MAIL_DIR}/xapian.old ${MAIL_DIR}/.notmuch/xapian'\r
 109 >  \r
 110 > +test_begin_subtest "Checking restored backup"\r
 111 >  output=$(notmuch search \* | notmuch_search_sanitize)\r
 112 >  test_expect_equal "$output" "\\r
 113 >  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
 114 > -- \r
 115 > 1.8.4.rc3\r
 116 >\r
 117 > _______________________________________________\r
 118 > notmuch mailing list\r
 119 > notmuch@notmuchmail.org\r
 120 > http://notmuchmail.org/mailman/listinfo/notmuch\r