28/c4d219839e9398c4b75da9fa340cd7c2d39f1e

   1 Return-Path: <dmitry.kurochkin@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 BD29F429E27\r
   6         for <notmuch@notmuchmail.org>; Sat, 28 May 2011 15:03:29 -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 T8JOl94-6PyG for <notmuch@notmuchmail.org>;\r
  17         Sat, 28 May 2011 15:03:29 -0700 (PDT)\r
  18 Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com\r
  19         [209.85.161.53]) (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 19F6F429E28\r
  22         for <notmuch@notmuchmail.org>; Sat, 28 May 2011 15:03:28 -0700 (PDT)\r
  23 Received: by mail-fx0-f53.google.com with SMTP id 8so2108915fxm.26\r
  24         for <notmuch@notmuchmail.org>; Sat, 28 May 2011 15:03:28 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer\r
  27         :in-reply-to:references;\r
  28         bh=QZrBuvdNvycfIljAgrCMyVMky+Iaebj0H84pDeSpGR4=;\r
  29         b=xtWig7x3YXdmAnUgDZhg64k86ytYXXc0dP70YQTrWEqJa4LyQBNc8Tjv+kodVemIXy\r
  30         eJs+W5YzuUWRMIGAfdGYsqtFx/l4bwSb57HYpu3kd9o5GwGqTy/VFMOtMeL0OZWpdtlM\r
  31         NSkv7hB66RP7TATrqx23KEHItOn9efH07+NMI=\r
  32 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
  33         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  34         b=hatZftBVveLu0ZAwMYECm4rUPF+6I7X665dyFhZlleUwK426Ew8zCxKq7XC3a4j0TJ\r
  35         JMo/qrGlQbzTTL7oCmF3nzUMNfPVnasVIeYrU2es5hstId6Orxf5gFf6NfjF8cE/E3qK\r
  36         BU9+OXv38linD5basLHQv4ZtFnoE2QoisoreU=\r
  37 Received: by 10.223.159.14 with SMTP id h14mr2685113fax.20.1306620208758;\r
  38         Sat, 28 May 2011 15:03:28 -0700 (PDT)\r
  39 Received: from localhost ([91.144.186.21])\r
  40         by mx.google.com with ESMTPS id n7sm276225fam.43.2011.05.28.15.03.27\r
  41         (version=TLSv1/SSLv3 cipher=OTHER);\r
  42         Sat, 28 May 2011 15:03:28 -0700 (PDT)\r
  43 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  44 To: notmuch@notmuchmail.org\r
  45 Subject: [PATCH 2/2] test: fix tests after notmuch show output changes related\r
  46         to filenames\r
  47 Date: Sun, 29 May 2011 02:03:48 +0400\r
  48 Message-Id: <1306620228-24351-2-git-send-email-dmitry.kurochkin@gmail.com>\r
  49 X-Mailer: git-send-email 1.7.5.3\r
  50 In-Reply-To: <1306620228-24351-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  51 References: <1306620228-24351-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  52 X-BeenThere: notmuch@notmuchmail.org\r
  53 X-Mailman-Version: 2.1.13\r
  54 Precedence: list\r
  55 List-Id: "Use and development of the notmuch mail system."\r
  56         <notmuch.notmuchmail.org>\r
  57 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  58         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  59 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  60 List-Post: <mailto:notmuch@notmuchmail.org>\r
  61 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  62 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  63         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  64 X-List-Received-Date: Sat, 28 May 2011 22:03:29 -0000\r
  65 \r
  66 ---\r
  67  test/crypto    |    3 +--\r
  68  test/multipart |   12 ++++--------\r
  69  2 files changed, 5 insertions(+), 10 deletions(-)\r
  70 \r
  71 diff --git a/test/crypto b/test/crypto\r
  72 index 8e92016..796c4ca 100755\r
  73 --- a/test/crypto\r
  74 +++ b/test/crypto\r
  75 @@ -168,8 +168,7 @@ Non-text part: application/pgp-encrypted\r
  76  \f\r
  77 part{ ID: 4, Content-type: text/plain\r
  78  This is a test encrypted message.\r
  79  \f\r
  80 part}\r
  81 -\f\r
  82 attachment{ ID: 5, Content-type: application/octet-stream\r
  83 -Attachment: TESTATTACHMENT (application/octet-stream)\r
  84 +\f\r
  85 attachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream\r
  86  Non-text part: application/octet-stream\r
  87  \f\r
  88 attachment}\r
  89  \f\r
  90 part}\r
  91 diff --git a/test/multipart b/test/multipart\r
  92 index 62efd84..9348fb6 100755\r
  93 --- a/test/multipart\r
  94 +++ b/test/multipart\r
  95 @@ -77,8 +77,7 @@ Date: Tue, 05 Jan 2001 15:43:57 -0000\r
  96  Non-text part: text/html\r
  97  \f\r
  98 part}\r
  99  \f\r
 100 part}\r
 101 -\f\r
 102 attachment{ ID: 5, Content-type: text/plain\r
 103 -Attachment: attachment (text/plain)\r
 104 +\f\r
 105 attachment{ ID: 5, Filename: attachment, Content-type: text/plain\r
 106  This is a text attachment.\r
 107  \f\r
 108 attachment}\r
 109  \f\r
 110 part{ ID: 6, Content-type: text/plain\r
 111 @@ -104,8 +103,7 @@ test_expect_equal "$output" \\r
 112  Non-text part: text/html\r
 113  \f\r
 114 part}\r
 115  \f\r
 116 part}\r
 117 -\f\r
 118 attachment{ ID: 5, Content-type: text/plain\r
 119 -Attachment: attachment (text/plain)\r
 120 +\f\r
 121 attachment{ ID: 5, Filename: attachment, Content-type: text/plain\r
 122  This is a text attachment.\r
 123  \f\r
 124 attachment}\r
 125  \f\r
 126 part{ ID: 6, Content-type: text/plain\r
 127 @@ -128,8 +126,7 @@ test_expect_equal "$output" \\r
 128  Non-text part: text/html\r
 129  \f\r
 130 part}\r
 131  \f\r
 132 part}\r
 133 -\f\r
 134 attachment{ ID: 5, Content-type: text/plain\r
 135 -Attachment: attachment (text/plain)\r
 136 +\f\r
 137 attachment{ ID: 5, Filename: attachment, Content-type: text/plain\r
 138  This is a text attachment.\r
 139  \f\r
 140 attachment}\r
 141  \f\r
 142 part{ ID: 6, Content-type: text/plain\r
 143 @@ -158,8 +155,7 @@ Non-text part: text/html\r
 144  test_begin_subtest "--format=text --part=5, inline attachement"\r
 145  output=$(notmuch show --format=text --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org')\r
 146  test_expect_equal "$output" \\r
 147 -"\f\r
 148 attachment{ ID: 5, Content-type: text/plain\r
 149 -Attachment: attachment (text/plain)\r
 150 +"\f\r
 151 attachment{ ID: 5, Filename: attachment, Content-type: text/plain\r
 152  This is a text attachment.\r
 153  \f\r
 154 attachment}"\r
 155  \r
 156 -- \r
 157 1.7.5.3\r
 158 \r