f9/95de613342fdbc5a1ab83bac105efc2342142e

   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 57B0E431FDB\r
   6         for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:25:06 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
   9 X-Spam-Flag: NO\r
  10 X-Spam-Score: -0.7\r
  11 X-Spam-Level: \r
  12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  13         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id 55azqNHXLKqj for <notmuch@notmuchmail.org>;\r
  17         Sun,  3 Nov 2013 04:24:58 -0800 (PST)\r
  18 Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com\r
  19         [209.85.215.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 06449431FBF\r
  22         for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:24:57 -0800 (PST)\r
  23 Received: by mail-ea0-f182.google.com with SMTP id o10so2860479eaj.41\r
  24         for <notmuch@notmuchmail.org>; Sun, 03 Nov 2013 04:24:56 -0800 (PST)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=1e100.net; s=20130820;\r
  27         h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
  28         :references:in-reply-to:references;\r
  29         bh=M8hdHdm5wZHwMa4yo5WrS+f65b/rngIY0VvDfg9gaU0=;\r
  30         b=f2uQ77lBwUXwwjUeV26ykaH+374lzSsfkxSY7UorW2Qeq00MqP5H0xgFV02vQrXROy\r
  31         12grG4yUJh/czdIsxenIkihy3c8uCCVGdejxOhMkGniQvfHCS7b4Eh+LHL7zWJpmtZZR\r
  32         bVu8r7jKgYYqnTp/pmiyQF0C/eWAy2oPP6U5eJXtk+YISEATy+pEyfySVimwMK2xp3Cr\r
  33         vlm2Mcy63P4MTMMF4j+Znsddyjam2iMhKQk9TQXHG2wBmH7Wx3iaNx3GVu/BSBykOyjf\r
  34         pUxXYtG0FK8ZvbSdA2cTpyz9lXiIG7/V0LiLdc/2Xf6Fs/l3KJwCoDKni9dPBRs/Z13r\r
  35         qhTg==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQlRD8siigFU1BNUxlaUvBArSxVa/gg1e2YgskroU/9lyH1vmnpuVIavj/IjvrzNjk4vegBL\r
  38 X-Received: by 10.14.48.14 with SMTP id u14mr145382eeb.74.1383481496822;\r
  39         Sun, 03 Nov 2013 04:24:56 -0800 (PST)\r
  40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  41         [88.195.111.91]) by mx.google.com with ESMTPSA id\r
  42         x47sm32772966eea.16.2013.11.03.04.24.55 for <multiple recipients>\r
  43         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  44         Sun, 03 Nov 2013 04:24:56 -0800 (PST)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: notmuch@notmuchmail.org\r
  47 Subject: [PATCH v2 01/11] test: fix compact backup / restore test\r
  48 Date: Sun,  3 Nov 2013 14:24:41 +0200\r
  49 Message-Id:\r
  50  <877a8e845940b35ab0ec226b8e0915ed56275611.1383481295.git.jani@nikula.org>\r
  51 X-Mailer: git-send-email 1.8.4.rc3\r
  52 In-Reply-To: <cover.1383481295.git.jani@nikula.org>\r
  53 References: <cover.1383481295.git.jani@nikula.org>\r
  54 In-Reply-To: <cover.1383481295.git.jani@nikula.org>\r
  55 References: <cover.1383481295.git.jani@nikula.org>\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:25:06 -0000\r
  69 \r
  70 From: David Bremner <david@tethera.net>\r
  71 \r
  72 It was looking in completely the wrong place for the backup and the\r
  73 (test) xapian database. Unfortunately test_begin_subtest hides the\r
  74 relevant errors.\r
  75 ---\r
  76  test/compact | 7 ++++---\r
  77  1 file changed, 4 insertions(+), 3 deletions(-)\r
  78 \r
  79 diff --git a/test/compact b/test/compact\r
  80 index 5bb5cea..afab537 100755\r
  81 --- a/test/compact\r
  82 +++ b/test/compact\r
  83 @@ -19,10 +19,11 @@ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
  84  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)\r
  85  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"\r
  86  \r
  87 -test_begin_subtest "Restoring backup"\r
  88 -rm -Rf ${TEST_TMPDIR}/mail/xapian\r
  89 -mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian\r
  90 +test_expect_success 'Restoring Backup' \\r
  91 +    'rm -Rf ${MAIL_DIR}/.notmuch/xapian &&\r
  92 +     mv ${MAIL_DIR}/xapian.old ${MAIL_DIR}/.notmuch/xapian'\r
  93  \r
  94 +test_begin_subtest "Checking restored backup"\r
  95  output=$(notmuch search \* | notmuch_search_sanitize)\r
  96  test_expect_equal "$output" "\\r
  97  thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
  98 -- \r
  99 1.8.4.rc3\r
 100 \r