a3/23aba22dd4f739b35d4fce20b734bd27363228

   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 AD1E0431FBD\r
   6         for <notmuch@notmuchmail.org>; Mon, 13 May 2013 11:27:17 -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 2E8LB9KKDcM9 for <notmuch@notmuchmail.org>;\r
  17         Mon, 13 May 2013 11:27:13 -0700 (PDT)\r
  18 Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com\r
  19         [209.85.217.178]) (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 2A7FD431FBC\r
  22         for <notmuch@notmuchmail.org>; Mon, 13 May 2013 11:27:12 -0700 (PDT)\r
  23 Received: by mail-lb0-f178.google.com with SMTP id p10so3044903lbv.37\r
  24         for <notmuch@notmuchmail.org>; Mon, 13 May 2013 11:27:09 -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-received:from:to:subject:date:message-id:x-mailer:in-reply-to\r
  28         :references:in-reply-to:references:x-gm-message-state;\r
  29         bh=Edy3HuPyuXXva6JYjoSq2i/R8ZpP/pq7VOi3/bFpuM0=;\r
  30         b=IUi6FsEVSmovDdQTk4mtcDsTQHNlQllprdEASVbM5/TdZAZZxnkW0t8bCEjYXZGoui\r
  31         chGYbPBVSBRmylUVLC3I2lJAUqn04kdjFQpHcf6qnxdqefkhsAo8/DkAwEL2nqpUf375\r
  32         dnZ4YGjqvdIIoYrAySWQkKBW6/kWP2z8Ma5un1tutmq9/gbalyAA20FV0i7+fr01DRiX\r
  33         0YmieOXWwPbwOyMxhMK6q2ZdylX+KcRIR2woEBzE2PrZGEGupZrk3feeTQaf/i3JG1Q1\r
  34         O7RBR7w9eiCyl30ehd1X3r4mnYQSIK3dEkWLrH/YHoe/+7WzTham4BgJlZ9PfnehptsP\r
  35         j7EQ==\r
  36 X-Received: by 10.152.37.164 with SMTP id z4mr3151260laj.21.1368469629404;\r
  37         Mon, 13 May 2013 11:27:09 -0700 (PDT)\r
  38 Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.\r
  39         [88.195.118.211])\r
  40         by mx.google.com with ESMTPSA id ay3sm6227975lab.1.2013.05.13.11.27.07\r
  41         for <notmuch@notmuchmail.org>\r
  42         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  43         Mon, 13 May 2013 11:27:08 -0700 (PDT)\r
  44 From: Jani Nikula <jani@nikula.org>\r
  45 To: notmuch@notmuchmail.org\r
  46 Subject: [PATCH 2/6] test: test notmuch search --duplicate=N\r
  47 Date: Mon, 13 May 2013 21:26:57 +0300\r
  48 Message-Id:\r
  49  <c3175dfaa04d4d92074e363d86325bd7ad7d4b66.1368467532.git.jani@nikula.org>\r
  50 X-Mailer: git-send-email 1.7.10.4\r
  51 In-Reply-To: <cover.1368467532.git.jani@nikula.org>\r
  52 References: <cover.1368467532.git.jani@nikula.org>\r
  53 In-Reply-To: <cover.1368467532.git.jani@nikula.org>\r
  54 References: <cover.1368467532.git.jani@nikula.org>\r
  55 X-Gm-Message-State:\r
  56  ALoCoQmEp+yFpUF0ZIcjDJxHLMvFVLcrIbBr6Sgeid4vXRTxaUjd42ZeRWDx7N9ZW9pHDT1yvdrc\r
  57 X-BeenThere: notmuch@notmuchmail.org\r
  58 X-Mailman-Version: 2.1.13\r
  59 Precedence: list\r
  60 List-Id: "Use and development of the notmuch mail system."\r
  61         <notmuch.notmuchmail.org>\r
  62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  65 List-Post: <mailto:notmuch@notmuchmail.org>\r
  66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  68         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  69 X-List-Received-Date: Mon, 13 May 2013 18:27:17 -0000\r
  70 \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..3268833 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=0"\r
  84 +notmuch search --output=files --duplicate=0 '*' | 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=1"\r
 149 +notmuch search --format=json --output=files --duplicate=1 '*' | 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