3c/0d870809fcf55ad9cbb8da9d1fc4566e77edcd

   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 18123431FDA\r
   6         for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:33 -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 N9MQZe0z2BYa for <notmuch@notmuchmail.org>;\r
  17         Mon, 28 Oct 2013 15:23:28 -0700 (PDT)\r
  18 Received: from mail-qa0-f50.google.com (mail-qa0-f50.google.com\r
  19         [209.85.216.50]) (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 0628B431FAF\r
  22         for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:27 -0700 (PDT)\r
  23 Received: by mail-qa0-f50.google.com with SMTP id cm18so2505009qab.9\r
  24         for <notmuch@notmuchmail.org>; Mon, 28 Oct 2013 15:23:27 -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;\r
  27         bh=AGdUOLDlmRscfTbD7v1hQxh0Ss9J0Kiu5LV2eJ7vLrU=;\r
  28         b=ocNeCc7npJ2EWUa7pXP9V5bxT/b9kvMKCo8XczMhwt8RDo22s3tRoom8J23Rc4Gkl4\r
  29         M1QNG5k9ZBdjs64MHeKYIUA9G+kY0pZVS18vtasv4gaVDL62sv9+C3OZquC/14R0noYu\r
  30         kj1c9/c4Uvs0G20FXWReOu05r1sxrcawtEVIXWKWJtfv2TSWkoRUiqsYA4I/FckbJu1G\r
  31         jdjSTvwDo8BC2DarpPkD4yu0Bp0n7BsUzxwlRrBQXolv+6vjdVYC8QCYUprb/ohlonOf\r
  32         gxX2M+yjABoL/AmXVD6xUykTWDzviSyjOd27l6cu2OdahBUeWFiajOLFYu+299oVSoo8\r
  33         snHQ==\r
  34 X-Received: by 10.224.54.209 with SMTP id r17mr33243454qag.16.1382999007564;\r
  35         Mon, 28 Oct 2013 15:23:27 -0700 (PDT)\r
  36 Received: from ben-laptop.hasb.physics.cns (physicsnat56.physics.umass.edu.\r
  37         [128.119.50.38])\r
  38         by mx.google.com with ESMTPSA id x1sm57796293qai.6.2013.10.28.15.23.26\r
  39         for <multiple recipients>\r
  40         (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
  41         Mon, 28 Oct 2013 15:23:27 -0700 (PDT)\r
  42 From: Ben Gamari <bgamari.foss@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 1/4] test: Add compact test\r
  45 Date: Mon, 28 Oct 2013 18:23:14 -0400\r
  46 Message-Id: <1382998997-9938-1-git-send-email-bgamari.foss@gmail.com>\r
  47 X-Mailer: git-send-email 1.8.3.2\r
  48 X-BeenThere: notmuch@notmuchmail.org\r
  49 X-Mailman-Version: 2.1.13\r
  50 Precedence: list\r
  51 List-Id: "Use and development of the notmuch mail system."\r
  52         <notmuch.notmuchmail.org>\r
  53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  54         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  56 List-Post: <mailto:notmuch@notmuchmail.org>\r
  57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  59         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  60 X-List-Received-Date: Mon, 28 Oct 2013 22:23:33 -0000\r
  61 \r
  62 Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>\r
  63 ---\r
  64  test/compact      | 35 +++++++++++++++++++++++++++++++++++\r
  65  test/notmuch-test |  1 +\r
  66  2 files changed, 36 insertions(+)\r
  67  create mode 100755 test/compact\r
  68 \r
  69 diff --git a/test/compact b/test/compact\r
  70 new file mode 100755\r
  71 index 0000000..54e85ab\r
  72 --- /dev/null\r
  73 +++ b/test/compact\r
  74 @@ -0,0 +1,35 @@\r
  75 +#!/usr/bin/env bash\r
  76 +test_description='"notmuch compact"'\r
  77 +. ./test-lib.sh\r
  78 +\r
  79 +add_message '[subject]=One'\r
  80 +add_message '[subject]=Two'\r
  81 +add_message '[subject]=Three'\r
  82 +\r
  83 +notmuch tag +tag1 \*\r
  84 +notmuch tag +tag2 subject:Two\r
  85 +notmuch tag -tag1 +tag3 subject:Three\r
  86 +\r
  87 +test_begin_subtest "Compacting"\r
  88 +notmuch compact\r
  89 +test_expect_success "compact" "notmuch compact"\r
  90 +\r
  91 +notmuch search \*\r
  92 +output=$(notmuch search \* | notmuch_search_sanitize)\r
  93 +test_expect_equal "$output" "\\r
  94 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
  95 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)\r
  96 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"\r
  97 +\r
  98 +test_begin_subtest "Restoring backup"\r
  99 +rm -Rf ${TEST_TMPDIR}/mail/xapian\r
 100 +mv ${TEST_TMPDIR}/mail/xapian.old ${TEST_TMPDIR}/mail/xapian\r
 101 +\r
 102 +notmuch search \*\r
 103 +output=$(notmuch search \* | notmuch_search_sanitize)\r
 104 +test_expect_equal "$output" "\\r
 105 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag1 unread)\r
 106 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag1 tag2 unread)\r
 107 +thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Three (inbox tag3 unread)"\r
 108 +\r
 109 +test_done\r
 110 diff --git a/test/notmuch-test b/test/notmuch-test\r
 111 index aa28bb0..ec94baf 100755\r
 112 --- a/test/notmuch-test\r
 113 +++ b/test/notmuch-test\r
 114 @@ -19,6 +19,7 @@ cd $(dirname "$0")\r
 115  TESTS="\r
 116    basic\r
 117    help-test\r
 118 +  compact\r
 119    config\r
 120    setup\r
 121    new\r
 122 -- \r
 123 1.8.3.2\r
 124 \r