5f/b3b1a5740185cc46e91181f52070f60be3dbd3

   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 7C5FA431FC3\r
   6         for <notmuch@notmuchmail.org>; Sun, 31 Mar 2013 02:46:29 -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 w9zWytTLSZsV for <notmuch@notmuchmail.org>;\r
  17         Sun, 31 Mar 2013 02:46:28 -0700 (PDT)\r
  18 Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com\r
  19         [209.85.217.169]) (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 DB8A4429E30\r
  22         for <notmuch@notmuchmail.org>; Sun, 31 Mar 2013 02:46:21 -0700 (PDT)\r
  23 Received: by mail-lb0-f169.google.com with SMTP id p11so1251861lbi.28\r
  24         for <notmuch@notmuchmail.org>; Sun, 31 Mar 2013 02:46:20 -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:cc:subject:date:message-id:x-mailer:in-reply-to\r
  28         :references:in-reply-to:references:x-gm-message-state;\r
  29         bh=iUkysQufjsRsiFiizusF6lYFGKXmYlhr58F+m8UjVsI=;\r
  30         b=Q+jJWEyhUokhay14V2v2WqvuC5ZpCRCY10r6CzzWgzToqmyKRKjEpK5MB2lY8EQvLT\r
  31         Mx8pD3ut4s6K3Cbb/AMfVFL5LwnV/bK1Rg9oBY3eVcNiObcoaAuCp9aVaoMZcyvGPIOW\r
  32         ap8oIC3qY2XOCSuOa+M6EG8Hx7EeRafXkku+OEkZc07OO5Nzz3BGX5Fm+emsvvc4tdWz\r
  33         DmlwutOMOcHaAifg+ZnvPreQ4BgJN5fzwkRNqSwZuLrSmQ70O4jYrq9eIaMENDqVHFhR\r
  34         mbMFUrZmqH2Ltmy1i+98wCrtm57E8l/VfbCPEH0CYGTPKHwIefrQHnXj7fTbAxnb8wWk\r
  35         nipw==\r
  36 X-Received: by 10.112.145.8 with SMTP id sq8mr4016072lbb.55.1364723180477;\r
  37         Sun, 31 Mar 2013 02:46:20 -0700 (PDT)\r
  38 Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
  39         [80.223.81.27])\r
  40         by mx.google.com with ESMTPS id nv3sm3709547lbb.15.2013.03.31.02.46.18\r
  41         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  42         Sun, 31 Mar 2013 02:46:19 -0700 (PDT)\r
  43 From: Jani Nikula <jani@nikula.org>\r
  44 To: notmuch@notmuchmail.org\r
  45 Subject: [PATCH v3 5/6] test: notmuch count --batch and --input options\r
  46 Date: Sun, 31 Mar 2013 12:46:02 +0300\r
  47 Message-Id:\r
  48  <b425e543ab3fabb51e9cc88fd6faee2c9433c636.1364722841.git.jani@nikula.org>\r
  49 X-Mailer: git-send-email 1.7.10.4\r
  50 In-Reply-To: <cover.1364722841.git.jani@nikula.org>\r
  51 References: <cover.1364722841.git.jani@nikula.org>\r
  52 In-Reply-To: <cover.1364722841.git.jani@nikula.org>\r
  53 References: <cover.1364722841.git.jani@nikula.org>\r
  54 X-Gm-Message-State:\r
  55  ALoCoQli9u8YvdLglsjlkWtcIPikEYJcfENL4ULw5bOTPyJFfOUBPh/5OlDEQ1qoDatxdtzHUr5p\r
  56 Cc: Tomi Ollila <tomi.ollila@iki.fi>\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: Sun, 31 Mar 2013 09:46:30 -0000\r
  70 \r
  71 ---\r
  72  test/count |   46 ++++++++++++++++++++++++++++++++++++++++++++++\r
  73  1 file changed, 46 insertions(+)\r
  74 \r
  75 diff --git a/test/count b/test/count\r
  76 index 879b114..05713fd 100755\r
  77 --- a/test/count\r
  78 +++ b/test/count\r
  79 @@ -38,4 +38,50 @@ test_expect_equal \\r
  80      "0" \\r
  81      "`notmuch count --output=threads from:cworth and not from:cworth`"\r
  82  \r
  83 +test_begin_subtest "message count is the default for batch count"\r
  84 +notmuch count --batch >OUTPUT <<EOF\r
  85 +\r
  86 +from:cworth\r
  87 +EOF\r
  88 +notmuch count --output=messages >EXPECTED\r
  89 +notmuch count --output=messages from:cworth >>EXPECTED\r
  90 +test_expect_equal_file EXPECTED OUTPUT\r
  91 +\r
  92 +test_begin_subtest "batch message count"\r
  93 +notmuch count --batch --output=messages >OUTPUT <<EOF\r
  94 +from:cworth\r
  95 +\r
  96 +tag:inbox\r
  97 +EOF\r
  98 +notmuch count --output=messages from:cworth >EXPECTED\r
  99 +notmuch count --output=messages >>EXPECTED\r
 100 +notmuch count --output=messages tag:inbox >>EXPECTED\r
 101 +test_expect_equal_file EXPECTED OUTPUT\r
 102 +\r
 103 +test_begin_subtest "batch thread count"\r
 104 +notmuch count --batch --output=threads >OUTPUT <<EOF\r
 105 +\r
 106 +from:cworth\r
 107 +from:cworth and not from:cworth\r
 108 +foo\r
 109 +EOF\r
 110 +notmuch count --output=threads >EXPECTED\r
 111 +notmuch count --output=threads from:cworth >>EXPECTED\r
 112 +notmuch count --output=threads from:cworth and not from:cworth >>EXPECTED\r
 113 +notmuch count --output=threads foo >>EXPECTED\r
 114 +test_expect_equal_file EXPECTED OUTPUT\r
 115 +\r
 116 +test_begin_subtest "batch message count with input file"\r
 117 +cat >INPUT <<EOF\r
 118 +from:cworth\r
 119 +\r
 120 +tag:inbox\r
 121 +EOF\r
 122 +notmuch count --input=INPUT --output=messages >OUTPUT\r
 123 +notmuch count --output=messages from:cworth >EXPECTED\r
 124 +notmuch count --output=messages >>EXPECTED\r
 125 +notmuch count --output=messages tag:inbox >>EXPECTED\r
 126 +test_expect_equal_file EXPECTED OUTPUT\r
 127 +\r
 128 +\r
 129  test_done\r
 130 -- \r
 131 1.7.10.4\r
 132 \r