40/14dfc3080aafe554934d821d3aadc17dbac6eb

   1 Return-Path: <bgamari.foss@gmail.com>\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 9E5A6431FBD\r
   6         for <notmuch@notmuchmail.org>; Mon, 14 Oct 2013 18:13:19 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, 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 xsbaOO-LiZij for <notmuch@notmuchmail.org>;\r
  17         Mon, 14 Oct 2013 18:13:13 -0700 (PDT)\r
  18 Received: from mail-qc0-f170.google.com (mail-qc0-f170.google.com\r
  19         [209.85.216.170]) (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 99075431FAF\r
  22         for <notmuch@notmuchmail.org>; Mon, 14 Oct 2013 18:13:13 -0700 (PDT)\r
  23 Received: by mail-qc0-f170.google.com with SMTP id n9so2456851qcw.29\r
  24         for <notmuch@notmuchmail.org>; Mon, 14 Oct 2013 18:13:12 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  26         h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
  27         bh=s6+xZwBuN9GIqyr36WPEvN3Mvmtlnnsmpy8ilby9S6A=;\r
  28         b=DkQJ9e3YmrFJr07Y0Q+odW3UjYiASayICT/wtn54P/Ks56XBeo10Fy588WUtG7MOhB\r
  29         q9mtT9cB5jU3X13VQ+ES5+klNN3BeI0ghRSa25RWG+9u+G/FQINmPhyzRSqrsnA7oI/W\r
  30         dLhLbwRlsFiYt2wfoUrNMIjRvR7baFJNzr5Sul31n1qloND46tyYqhFqIUspjuHVdGzj\r
  31         wT2WGZQpQuEGrHfOLtTAV48At5UrjLKWkofiwGInzQzplB9YSIyaXllmTeBB1nC3IsZt\r
  32         pi+vnFCPu1DvR0ug+MMYols+SlZ32AIG/JCftbCNpK3t2qCMBI1bIxTCS3tSu8B15fln\r
  33         iqBA==\r
  34 X-Received: by 10.224.123.13 with SMTP id n13mr26257198qar.33.1381799592009;\r
  35         Mon, 14 Oct 2013 18:13:12 -0700 (PDT)\r
  36 Received: from localhost.localdomain\r
  37         (pool-108-8-224-250.spfdma.east.verizon.net. [108.8.224.250])\r
  38         by mx.google.com with ESMTPSA id\r
  39         og1sm105736333qeb.3.1969.12.31.16.00.00\r
  40         (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
  41         Mon, 14 Oct 2013 18:13:11 -0700 (PDT)\r
  42 From: Ben Gamari <bgamari.foss@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 1/3] test: Add compact test\r
  45 Date: Mon, 14 Oct 2013 21:13:03 -0400\r
  46 Message-Id: <1381799585-16274-2-git-send-email-bgamari.foss@gmail.com>\r
  47 X-Mailer: git-send-email 1.8.1.2\r
  48 In-Reply-To: <1381799585-16274-1-git-send-email-bgamari.foss@gmail.com>\r
  49 References: <1381799585-16274-1-git-send-email-bgamari.foss@gmail.com>\r
  50 X-BeenThere: notmuch@notmuchmail.org\r
  51 X-Mailman-Version: 2.1.13\r
  52 Precedence: list\r
  53 List-Id: "Use and development of the notmuch mail system."\r
  54         <notmuch.notmuchmail.org>\r
  55 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  56         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  57 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  58 List-Post: <mailto:notmuch@notmuchmail.org>\r
  59 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  60 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  61         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  62 X-List-Received-Date: Tue, 15 Oct 2013 01:13:20 -0000\r
  63 \r
  64 Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>\r
  65 ---\r
  66  test/compact      | 35 +++++++++++++++++++++++++++++++++++\r
  67  test/notmuch-test |  1 +\r
  68  2 files changed, 36 insertions(+)\r
  69  create mode 100755 test/compact\r
  70 \r
  71 diff --git a/test/compact b/test/compact\r
  72 new file mode 100755\r
  73 index 0000000..54e85ab\r
  74 --- /dev/null\r
  75 +++ b/test/compact\r
  76 @@ -0,0 +1,35 @@\r
  77 +#!/usr/bin/env bash\r
  78 +test_description='"notmuch compact"'\r
  79 +. ./test-lib.sh\r
  80 +\r
  81 +add_message '[subject]=One'\r
  82 +add_message '[subject]=Two'\r
  83 +add_message '[subject]=Three'\r
  84 +\r
  85 +notmuch tag +tag1 \*\r
  86 +notmuch tag +tag2 subject:Two\r
  87 +notmuch tag -tag1 +tag3 subject:Three\r
  88 +\r
  89 +test_begin_subtest "Compacting"\r
  90 +notmuch compact\r
  91 +test_expect_success "compact" "notmuch compact"\r
  92 +\r
  93 +notmuch search \*\r
  94 +output=$(notmuch search \* | notmuch_search_sanitize)\r
  95 +test_expect_equal "$output" "\\r
  96 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
  97 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)\r
  98 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"\r
  99 +\r
 100 +test_begin_subtest "Restoring backup"\r
 101 +rm -Rf ${TEST_TMPDIR}/mail/xapian\r
 102 +mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian\r
 103 +\r
 104 +notmuch search \*\r
 105 +output=$(notmuch search \* | notmuch_search_sanitize)\r
 106 +test_expect_equal "$output" "\\r
 107 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
 108 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)\r
 109 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"\r
 110 +\r
 111 +test_done\r
 112 diff --git a/test/notmuch-test b/test/notmuch-test\r
 113 index aa28bb0..ec94baf 100755\r
 114 --- a/test/notmuch-test\r
 115 +++ b/test/notmuch-test\r
 116 @@ -19,6 +19,7 @@ cd $(dirname "$0")\r
 117  TESTS="\r
 118    basic\r
 119    help-test\r
 120 +  compact\r
 121    config\r
 122    setup\r
 123    new\r
 124 -- \r
 125 1.8.1.2\r
 126 \r