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