From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 8A8F66DE11D4 for ; Sat, 3 Jun 2017 10:48:30 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5 tests=[AWL=0.010, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I3DV53IkQwXg for ; Sat, 3 Jun 2017 10:48:30 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id A2C176DE0C51 for ; Sat, 3 Jun 2017 10:48:17 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1dHD8u-0002P3-UD; Sat, 03 Jun 2017 13:47:16 -0400 Received: (nullmailer pid 17082 invoked by uid 1000); Sat, 03 Jun 2017 17:48:04 -0000 From: David Bremner To: notmuch@notmuchmail.org, notmuch@freelists.org Subject: [PATCH 04/23] test/multipart: reorganize creation of multipart message Date: Sat, 3 Jun 2017 14:47:35 -0300 Message-Id: <20170603174754.16911-5-david@tethera.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170603174754.16911-1-david@tethera.net> References: <20170603174754.16911-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.23 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, 03 Jun 2017 17:48:30 -0000 We want to have the bodies of the multipart available in a file on their own for planned modifications to tests. --- test/T190-multipart.sh | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh index 12a10451..91a632c6 100755 --- a/test/T190-multipart.sh +++ b/test/T190-multipart.sh @@ -2,14 +2,7 @@ test_description="output of multipart message" . ./test-lib.sh || exit 1 -cat < embedded_message -From: Carl Worth -To: cworth@cworth.org -Subject: html message -Date: Fri, 05 Jan 2001 15:42:57 +0000 -User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) -Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org> -MIME-Version: 1.0 +cat < embedded_message_body Content-Type: multipart/alternative; boundary="==-=-==" --==-=-== @@ -24,15 +17,19 @@ This is an embedded message, with a multipart/alternative part. --==-=-==-- EOF - -cat < ${MAIL_DIR}/multipart +cat < embedded_message From: Carl Worth To: cworth@cworth.org -Subject: Multipart message -Date: Fri, 05 Jan 2001 15:43:57 +0000 +Subject: html message +Date: Fri, 05 Jan 2001 15:42:57 +0000 User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) -Message-ID: <87liy5ap00.fsf@yoom.home.cworth.org> +Message-ID: <87liy5ap01.fsf@yoom.home.cworth.org> MIME-Version: 1.0 +EOF + +cat embedded_message_body >> embedded_message + +cat < multipart_body Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" @@ -44,8 +41,9 @@ Content-Type: message/rfc822 Content-Disposition: inline EOF -cat embedded_message >> ${MAIL_DIR}/multipart -cat <> ${MAIL_DIR}/multipart + +cat embedded_message >> multipart_body +cat <> multipart_body --=-=-= Content-Disposition: attachment; filename=attachment @@ -73,6 +71,18 @@ W6cAmQE4dcYrx/LPLtYLZm1jsGauE5hE --==-=-=-- EOF +cat < ${MAIL_DIR}/multipart +From: Carl Worth +To: cworth@cworth.org +Subject: Multipart message +Date: Fri, 05 Jan 2001 15:43:57 +0000 +User-Agent: Notmuch/0.5 (http://notmuchmail.org) Emacs/23.3.1 (i486-pc-linux-gnu) +Message-ID: <87liy5ap00.fsf@yoom.home.cworth.org> +MIME-Version: 1.0 +EOF + +cat multipart_body >> ${MAIL_DIR}/multipart + cat < ${MAIL_DIR}/base64-part-with-crlf From: Carl Worth To: cworth@cworth.org -- 2.11.0