about summary refs log tree commit homepage
path: root/xt
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-01-11 06:28:15 +0000
committerEric Wong <e@yhbt.net>2020-01-12 21:26:38 +0000
commit80e819ceebf922ecda684cc8ef0848ddc709a73c (patch)
tree27c0bd0faa8768aab0c72fc386370e49d07a9e47 /xt
parentab2b0607f05904866784684603c4a1f5c13c1e80 (diff)
downloadpublic-inbox-80e819ceebf922ecda684cc8ef0848ddc709a73c.tar.gz
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.
Diffstat (limited to 'xt')
-rw-r--r--xt/mem-msgview.t32
1 files changed, 22 insertions, 10 deletions
diff --git a/xt/mem-msgview.t b/xt/mem-msgview.t
index 0c3ad710..bffb1768 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);
@@ -10,7 +12,7 @@ use Test::More;
 my @mods = qw(DBD::SQLite BSD::Resource PublicInbox::WWW);
 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";
@@ -31,29 +33,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;