From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@yhbt.net>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 484E51FD47
	for <meta@public-inbox.org>; Sat, 11 Jan 2020 06:28:17 +0000 (UTC)
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 1/2] xt/mem-msgview.t: change to test one multipart message
Date: Sat, 11 Jan 2020 06:28:15 +0000
Message-Id: <20200111062816.9891-2-e@yhbt.net>
In-Reply-To: <20200111062816.9891-1-e@yhbt.net>
References: <20200111062816.9891-1-e@yhbt.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

A single multipart message is far more common than
a reused Message-ID, so rewrite the test to only have
a single multipart message.  Memory improvements will
be implemented in the next commit.
---
 xt/mem-msgview.t | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/xt/mem-msgview.t b/xt/mem-msgview.t
index 1ea0f559..68b5919f 100644
--- a/xt/mem-msgview.t
+++ b/xt/mem-msgview.t
@@ -1,6 +1,8 @@
 #!perl -w
 # Copyright (C) 2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+# Note: this may be altered as-needed to demonstrate improvements.
+# See history in git for this file.
 use strict;
 use IO::Handle; # ->flush
 use Fcntl qw(SEEK_SET);
@@ -11,7 +13,7 @@ use Test::More;
 my @mods = qw(DBD::SQLite BSD::Resource);
 require_mods(@mods);
 use_ok($_) for @mods;
-my $lines = $ENV{NR_LINES} // 100000;
+my $lines = $ENV{NR_LINES} // 50000;
 my ($tmpdir, $for_destroy) = tmpdir();
 my $inboxname = 'big';
 my $inboxdir = "$tmpdir/big";
@@ -32,29 +34,39 @@ EOF
 		'inbox initialized');
 
 	$fh = tmpfile('big.eml', undef, my $append = 1) or die;
-	printf($fh <<'EOF', $addr, $mid) or die;
+	my $hdr = sprintf(<<'EOF', $addr, $mid);
 From: Dr. X <x@example.com>
 To: Nikki <%s>
 Date: Tue, 3 May 1988 00:00:00 +0000
 Subject: todo
 Message-ID: <%s>
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="FOO"
+Content-Disposition: inline
+
+--FOO
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+
+EOF
+	print $fh $hdr or die;
+	for (0..$lines) { print $fh 'x' x 72, "\n" or die }
+	print $fh <<EOF or die;
+
+--FOO
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
 
 EOF
 	for (0..$lines) { print $fh 'x' x 72, "\n" or die }
+	print $fh "\n--FOO--\n" or die;
 	$fh->flush or die;
 	sysseek($fh, 0, SEEK_SET) or die;
 	my $env = { ORIGINAL_RECIPIENT => $addr };
 	my $err = '';
 	my $opt = { 0 => $fh, 2 => \$err, run_mode => 0 };
 	ok(run_script([qw(-mda --no-precheck)], $env, $opt),
-		'1st message delivered');
-
-	# resend the message with same mid but different content
-	print $fh "mindcrime\n" or die;
-	$fh->flush or die;
-	sysseek($fh, 0, SEEK_SET) or die;
-	ok(run_script([qw(-mda --no-precheck)], $env, $opt),
-		'2nd message delivered');
+		'message delivered');
 }
 
 my $www = PublicInbox::WWW->new;