--- /dev/null
+Return-Path: <dmitry.kurochkin@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id BD29F429E27\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2011 15:03:29 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id T8JOl94-6PyG for <notmuch@notmuchmail.org>;\r
+ Sat, 28 May 2011 15:03:29 -0700 (PDT)\r
+Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com\r
+ [209.85.161.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 19F6F429E28\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2011 15:03:28 -0700 (PDT)\r
+Received: by mail-fx0-f53.google.com with SMTP id 8so2108915fxm.26\r
+ for <notmuch@notmuchmail.org>; Sat, 28 May 2011 15:03:28 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+ h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer\r
+ :in-reply-to:references;\r
+ bh=QZrBuvdNvycfIljAgrCMyVMky+Iaebj0H84pDeSpGR4=;\r
+ b=xtWig7x3YXdmAnUgDZhg64k86ytYXXc0dP70YQTrWEqJa4LyQBNc8Tjv+kodVemIXy\r
+ eJs+W5YzuUWRMIGAfdGYsqtFx/l4bwSb57HYpu3kd9o5GwGqTy/VFMOtMeL0OZWpdtlM\r
+ NSkv7hB66RP7TATrqx23KEHItOn9efH07+NMI=\r
+DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+ b=hatZftBVveLu0ZAwMYECm4rUPF+6I7X665dyFhZlleUwK426Ew8zCxKq7XC3a4j0TJ\r
+ JMo/qrGlQbzTTL7oCmF3nzUMNfPVnasVIeYrU2es5hstId6Orxf5gFf6NfjF8cE/E3qK\r
+ BU9+OXv38linD5basLHQv4ZtFnoE2QoisoreU=\r
+Received: by 10.223.159.14 with SMTP id h14mr2685113fax.20.1306620208758;\r
+ Sat, 28 May 2011 15:03:28 -0700 (PDT)\r
+Received: from localhost ([91.144.186.21])\r
+ by mx.google.com with ESMTPS id n7sm276225fam.43.2011.05.28.15.03.27\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Sat, 28 May 2011 15:03:28 -0700 (PDT)\r
+From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] test: fix tests after notmuch show output changes related\r
+ to filenames\r
+Date: Sun, 29 May 2011 02:03:48 +0400\r
+Message-Id: <1306620228-24351-2-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-Mailer: git-send-email 1.7.5.3\r
+In-Reply-To: <1306620228-24351-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+References: <1306620228-24351-1-git-send-email-dmitry.kurochkin@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 28 May 2011 22:03:29 -0000\r
+\r
+---\r
+ test/crypto | 3 +--\r
+ test/multipart | 12 ++++--------\r
+ 2 files changed, 5 insertions(+), 10 deletions(-)\r
+\r
+diff --git a/test/crypto b/test/crypto\r
+index 8e92016..796c4ca 100755\r
+--- a/test/crypto\r
++++ b/test/crypto\r
+@@ -168,8 +168,7 @@ Non-text part: application/pgp-encrypted\r
+ \f\r
+part{ ID: 4, Content-type: text/plain\r
+ This is a test encrypted message.\r
+ \f\r
+part}\r
+-\f\r
+attachment{ ID: 5, Content-type: application/octet-stream\r
+-Attachment: TESTATTACHMENT (application/octet-stream)\r
++\f\r
+attachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream\r
+ Non-text part: application/octet-stream\r
+ \f\r
+attachment}\r
+ \f\r
+part}\r
+diff --git a/test/multipart b/test/multipart\r
+index 62efd84..9348fb6 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -77,8 +77,7 @@ Date: Tue, 05 Jan 2001 15:43:57 -0000\r
+ Non-text part: text/html\r
+ \f\r
+part}\r
+ \f\r
+part}\r
+-\f\r
+attachment{ ID: 5, Content-type: text/plain\r
+-Attachment: attachment (text/plain)\r
++\f\r
+attachment{ ID: 5, Filename: attachment, Content-type: text/plain\r
+ This is a text attachment.\r
+ \f\r
+attachment}\r
+ \f\r
+part{ ID: 6, Content-type: text/plain\r
+@@ -104,8 +103,7 @@ test_expect_equal "$output" \\r
+ Non-text part: text/html\r
+ \f\r
+part}\r
+ \f\r
+part}\r
+-\f\r
+attachment{ ID: 5, Content-type: text/plain\r
+-Attachment: attachment (text/plain)\r
++\f\r
+attachment{ ID: 5, Filename: attachment, Content-type: text/plain\r
+ This is a text attachment.\r
+ \f\r
+attachment}\r
+ \f\r
+part{ ID: 6, Content-type: text/plain\r
+@@ -128,8 +126,7 @@ test_expect_equal "$output" \\r
+ Non-text part: text/html\r
+ \f\r
+part}\r
+ \f\r
+part}\r
+-\f\r
+attachment{ ID: 5, Content-type: text/plain\r
+-Attachment: attachment (text/plain)\r
++\f\r
+attachment{ ID: 5, Filename: attachment, Content-type: text/plain\r
+ This is a text attachment.\r
+ \f\r
+attachment}\r
+ \f\r
+part{ ID: 6, Content-type: text/plain\r
+@@ -158,8 +155,7 @@ Non-text part: text/html\r
+ test_begin_subtest "--format=text --part=5, inline attachement"\r
+ output=$(notmuch show --format=text --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org')\r
+ test_expect_equal "$output" \\r
+-"\f\r
+attachment{ ID: 5, Content-type: text/plain\r
+-Attachment: attachment (text/plain)\r
++"\f\r
+attachment{ ID: 5, Filename: attachment, Content-type: text/plain\r
+ This is a text attachment.\r
+ \f\r
+attachment}"\r
+ \r
+-- \r
+1.7.5.3\r
+\r