be/e65e013d954036873d8fa6fd0082b29c9b6d3f

   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 415C3429E58\r
   6         for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 05:11:47 -0700 (PDT)\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 iSl3OUBVQmu3 for <notmuch@notmuchmail.org>;\r
  17         Sat, 17 Aug 2013 05:11:42 -0700 (PDT)\r
  18 Received: from mail-bk0-f43.google.com (mail-bk0-f43.google.com\r
  19         [209.85.214.43]) (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 D7836429E59\r
  22         for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 05:11:37 -0700 (PDT)\r
  23 Received: by mail-bk0-f43.google.com with SMTP id mz13so907390bkb.2\r
  24         for <notmuch@notmuchmail.org>; Sat, 17 Aug 2013 05:11:36 -0700 (PDT)\r
  25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
  26         d=google.com; s=20120113;\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=vUOadL1+0/RpoLGtNCyP7EhDDb2j0Ct+vSFU1J+DCvM=;\r
  30         b=KkVo4uOn+EwxiA1AEmZ/7kSjf7mDkuWxd/Q+Wbx3tuzv9babeByrCiBrk5Bxc+/Jqs\r
  31         ssMA3p7kCmBK0PKYXlUbRITw7pgsCHGyFOhHYO/1TIWMku9As4YlLwdKONS82jq6aeWx\r
  32         xA1yMXCJOifZkHo9uPTzQUdmce316BVuK+thMgo0vKGEvYFuId8/Z46oZBbStc1RR8U/\r
  33         23HCP5a6F9QM9HNtGYHdv2+YJPBqLiuaeLBNprAr0MYCt/hJSmRmdlYv3Pd/e2pUDOdo\r
  34         ZsFIU/Ux/TIeJY5+68izqYSHEoE9jHlq7JvBiHPlk26KNr9JT91wtAznlrClqB4CYcCx\r
  35         dTUQ==\r
  36 X-Gm-Message-State:\r
  37  ALoCoQnsUa+V5xGlgdEZb8CHhDVYjIqPVTL+G69s4+DzUBp7oVw5fv9GjxR0f4+U5tr+OsT5nLb/\r
  38 X-Received: by 10.204.224.142 with SMTP id io14mr1957bkb.27.1376741496524;\r
  39         Sat, 17 Aug 2013 05:11:36 -0700 (PDT)\r
  40 Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
  41         [88.195.111.91])\r
  42         by mx.google.com with ESMTPSA id pn6sm249358bkb.14.1969.12.31.16.00.00\r
  43         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  44         Sat, 17 Aug 2013 05:11:35 -0700 (PDT)\r
  45 From: Jani Nikula <jani@nikula.org>\r
  46 To: notmuch@notmuchmail.org\r
  47 Subject: [PATCH v3 2/8] test: test notmuch search --duplicate=N\r
  48 Date: Sat, 17 Aug 2013 15:11:27 +0300\r
  49 Message-Id:\r
  50  <88dc38a1e8c4c15bfb84586bdef9e6b60fc4c290.1376741447.git.jani@nikula.org>\r
  51 X-Mailer: git-send-email 1.7.10.4\r
  52 In-Reply-To: <cover.1376741447.git.jani@nikula.org>\r
  53 References: <cover.1376741447.git.jani@nikula.org>\r
  54 In-Reply-To: <cover.1376741447.git.jani@nikula.org>\r
  55 References: <cover.1376741447.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: Sat, 17 Aug 2013 12:11:47 -0000\r
  69 \r
  70 Add test for notmuch search --duplicate=N option.\r
  71 ---\r
  72  test/search-output |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++++\r
  73  1 file changed, 65 insertions(+)\r
  74 \r
  75 diff --git a/test/search-output b/test/search-output\r
  76 index c2a87eb..5ccfeaf 100755\r
  77 --- a/test/search-output\r
  78 +++ b/test/search-output\r
  79 @@ -239,6 +239,64 @@ MAIL_DIR/cur/01:2,\r
  80  EOF\r
  81  test_expect_equal_file OUTPUT EXPECTED\r
  82  \r
  83 +test_begin_subtest "--output=files --duplicate=1"\r
  84 +notmuch search --output=files --duplicate=1 '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
  85 +cat <<EOF >EXPECTED\r
  86 +MAIL_DIR/cur/52:2,\r
  87 +MAIL_DIR/cur/53:2,\r
  88 +MAIL_DIR/cur/50:2,\r
  89 +MAIL_DIR/cur/49:2,\r
  90 +MAIL_DIR/cur/48:2,\r
  91 +MAIL_DIR/cur/47:2,\r
  92 +MAIL_DIR/cur/46:2,\r
  93 +MAIL_DIR/cur/45:2,\r
  94 +MAIL_DIR/cur/44:2,\r
  95 +MAIL_DIR/cur/43:2,\r
  96 +MAIL_DIR/cur/42:2,\r
  97 +MAIL_DIR/cur/41:2,\r
  98 +MAIL_DIR/cur/40:2,\r
  99 +MAIL_DIR/cur/39:2,\r
 100 +MAIL_DIR/cur/38:2,\r
 101 +MAIL_DIR/cur/37:2,\r
 102 +MAIL_DIR/cur/36:2,\r
 103 +MAIL_DIR/cur/35:2,\r
 104 +MAIL_DIR/cur/34:2,\r
 105 +MAIL_DIR/cur/33:2,\r
 106 +MAIL_DIR/cur/32:2,\r
 107 +MAIL_DIR/cur/31:2,\r
 108 +MAIL_DIR/cur/30:2,\r
 109 +MAIL_DIR/cur/29:2,\r
 110 +MAIL_DIR/cur/28:2,\r
 111 +MAIL_DIR/cur/27:2,\r
 112 +MAIL_DIR/cur/26:2,\r
 113 +MAIL_DIR/cur/25:2,\r
 114 +MAIL_DIR/cur/24:2,\r
 115 +MAIL_DIR/cur/23:2,\r
 116 +MAIL_DIR/cur/22:2,\r
 117 +MAIL_DIR/cur/21:2,\r
 118 +MAIL_DIR/cur/19:2,\r
 119 +MAIL_DIR/cur/18:2,\r
 120 +MAIL_DIR/cur/20:2,\r
 121 +MAIL_DIR/cur/17:2,\r
 122 +MAIL_DIR/cur/16:2,\r
 123 +MAIL_DIR/cur/15:2,\r
 124 +MAIL_DIR/cur/14:2,\r
 125 +MAIL_DIR/cur/13:2,\r
 126 +MAIL_DIR/cur/12:2,\r
 127 +MAIL_DIR/cur/11:2,\r
 128 +MAIL_DIR/cur/10:2,\r
 129 +MAIL_DIR/cur/09:2,\r
 130 +MAIL_DIR/cur/08:2,\r
 131 +MAIL_DIR/cur/06:2,\r
 132 +MAIL_DIR/cur/05:2,\r
 133 +MAIL_DIR/cur/04:2,\r
 134 +MAIL_DIR/cur/03:2,\r
 135 +MAIL_DIR/cur/07:2,\r
 136 +MAIL_DIR/cur/02:2,\r
 137 +MAIL_DIR/cur/01:2,\r
 138 +EOF\r
 139 +test_expect_equal_file OUTPUT EXPECTED\r
 140 +\r
 141  test_begin_subtest "--output=files --format=json"\r
 142  notmuch search --format=json --output=files '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
 143  cat <<EOF >EXPECTED\r
 144 @@ -298,6 +356,13 @@ cat <<EOF >EXPECTED\r
 145  EOF\r
 146  test_expect_equal_file OUTPUT EXPECTED\r
 147  \r
 148 +test_begin_subtest "--output=files --format=json --duplicate=2"\r
 149 +notmuch search --format=json --output=files --duplicate=2 '*' | sed -e "s,$MAIL_DIR,MAIL_DIR," >OUTPUT\r
 150 +cat <<EOF >EXPECTED\r
 151 +["MAIL_DIR/cur/51:2,"]\r
 152 +EOF\r
 153 +test_expect_equal_file OUTPUT EXPECTED\r
 154 +\r
 155  test_begin_subtest "--output=tags"\r
 156  notmuch search --output=tags '*' >OUTPUT\r
 157  cat <<EOF >EXPECTED\r
 158 -- \r
 159 1.7.10.4\r
 160 \r