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 65931431FBF for ; Sun, 5 Aug 2012 00:23:00 -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 yhD81x02EihV for ; Sun, 5 Aug 2012 00:22:59 -0700 (PDT) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id BD866431FB6 for ; Sun, 5 Aug 2012 00:22:58 -0700 (PDT) Received: by mail-pb0-f53.google.com with SMTP id ro8so3935886pbb.26 for ; Sun, 05 Aug 2012 00:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=ih2RhhTfEv8hjCF/o9vvOovW3JIovK+jhtURw0LHng8=; b=pbemADZz3LVjJMSl4eo3E4R4s/CAygwYumv5vXQD60Dp7CeNQLk9UaqppSsmeanpPd 8MFvR32oNQcfpMEMEy8XgKUvwUYCBpzflKMSZKgwPK2GHRYIo4Ow8OeXdvHFB7nu3VSt c/Pqlu+SQ47i5q2RvBhqPDXQF/N5J3+1yEE1DIGsNCWx5vA5omE9bZ4nYULej/CrjAs9 XQhbLPPX0hls35ke4Xa1VT8OMnjzD73HnrW++Bum0ulKc5GSXc39B9CZl5TrRKWs7flv y78k0NiJ6UVQQonaOwCpp8YAnzocmEEolBUl9WlafwLE9OLNSX/pXHCSAWNNnXEZI++B +/Pg== Received: by 10.68.229.2 with SMTP id sm2mr9807808pbc.57.1344151378571; Sun, 05 Aug 2012 00:22:58 -0700 (PDT) Received: from localhost (215.42.233.220.static.exetel.com.au. [220.233.42.215]) by mx.google.com with ESMTPS id qi8sm6409079pbc.36.2012.08.05.00.22.56 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 05 Aug 2012 00:22:57 -0700 (PDT) From: Peter Wang To: notmuch@notmuchmail.org Subject: [PATCH 4/4] test: conform to content-length fields (text) Date: Sun, 5 Aug 2012 17:22:25 +1000 Message-Id: <1344151345-25411-4-git-send-email-novalazy@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1344151345-25411-1-git-send-email-novalazy@gmail.com> References: <1344151345-25411-1-git-send-email-novalazy@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: Sun, 05 Aug 2012 07:23:00 -0000 Update tests to expect Content-length fields in show --format=text output, for leaf parts with omitted body content. --- test/crypto | 4 ++-- test/multipart | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/crypto b/test/crypto index 4a73dcc..8dfbfa6 100755 --- a/test/crypto +++ b/test/crypto @@ -161,14 +161,14 @@ Date: Sat, 01 Jan 2000 12:00:00 +0000 header} body{ part{ ID: 1, Content-type: multipart/encrypted - part{ ID: 2, Content-type: application/pgp-encrypted + part{ ID: 2, Content-type: application/pgp-encrypted, Content-length: 11 Non-text part: application/pgp-encrypted part} part{ ID: 3, Content-type: multipart/mixed part{ ID: 4, Content-type: text/plain This is a test encrypted message. part} - attachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream + attachment{ ID: 5, Filename: TESTATTACHMENT, Content-type: application/octet-stream, Content-length: 28 Non-text part: application/octet-stream attachment} part} diff --git a/test/multipart b/test/multipart index 0f9e113..064e91a 100755 --- a/test/multipart +++ b/test/multipart @@ -129,7 +129,7 @@ Date: Fri, 05 Jan 2001 15:42:57 +0000 header} body{ part{ ID: 4, Content-type: multipart/alternative - part{ ID: 5, Content-type: text/html + part{ ID: 5, Content-type: text/html, Content-length: 71 Non-text part: text/html part} part{ ID: 6, Content-type: text/plain @@ -147,7 +147,7 @@ And this message is signed. -Carl part} part} - part{ ID: 9, Content-type: application/pgp-signature + part{ ID: 9, Content-type: application/pgp-signature, Content-length: 197 Non-text part: application/pgp-signature part} part} @@ -170,7 +170,7 @@ Date: Fri, 05 Jan 2001 15:42:57 +0000 header} body{ part{ ID: 4, Content-type: multipart/alternative - part{ ID: 5, Content-type: text/html + part{ ID: 5, Content-type: text/html, Content-length: 71 Non-text part: text/html part} part{ ID: 6, Content-type: text/plain @@ -188,7 +188,7 @@ And this message is signed. -Carl part} part} - part{ ID: 9, Content-type: application/pgp-signature + part{ ID: 9, Content-type: application/pgp-signature, Content-length: 197 Non-text part: application/pgp-signature part} part} @@ -208,7 +208,7 @@ Date: Fri, 05 Jan 2001 15:42:57 +0000 header} body{ part{ ID: 4, Content-type: multipart/alternative - part{ ID: 5, Content-type: text/html + part{ ID: 5, Content-type: text/html, Content-length: 71 Non-text part: text/html part} part{ ID: 6, Content-type: text/plain @@ -241,7 +241,7 @@ Date: Fri, 05 Jan 2001 15:42:57 +0000 header} body{ part{ ID: 4, Content-type: multipart/alternative - part{ ID: 5, Content-type: text/html + part{ ID: 5, Content-type: text/html, Content-length: 71 Non-text part: text/html part} part{ ID: 6, Content-type: text/plain @@ -257,7 +257,7 @@ test_begin_subtest "--format=text --part=4, rfc822's multipart" notmuch show --format=text --part=4 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT cat <EXPECTED part{ ID: 4, Content-type: multipart/alternative - part{ ID: 5, Content-type: text/html + part{ ID: 5, Content-type: text/html, Content-length: 71 Non-text part: text/html part} part{ ID: 6, Content-type: text/plain @@ -270,7 +270,7 @@ test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "--format=text --part=5, rfc822's html part" notmuch show --format=text --part=5 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT cat <EXPECTED - part{ ID: 5, Content-type: text/html + part{ ID: 5, Content-type: text/html, Content-length: 71 Non-text part: text/html part} EOF @@ -308,7 +308,7 @@ test_expect_equal_file OUTPUT EXPECTED test_begin_subtest "--format=text --part=9, pgp signature (unverified)" notmuch show --format=text --part=9 'id:87liy5ap00.fsf@yoom.home.cworth.org' >OUTPUT cat <EXPECTED - part{ ID: 9, Content-type: application/pgp-signature + part{ ID: 9, Content-type: application/pgp-signature, Content-length: 197 Non-text part: application/pgp-signature part} EOF -- 1.7.4.4