From 9aaf9cf73f7b126ad3d2726adf7c764630626d67 Mon Sep 17 00:00:00 2001 From: "Eric Wong (Contractor, The Linux Foundation)" Date: Thu, 29 Mar 2018 09:57:45 +0000 Subject: v2writable: append, instead of prepending generated Message-ID The original Message-ID is still the most important when discussing with other recipients who do not rely on a message flowing through public-inbox. So whatever Message-ID we use to deduplicate internally will be secondary and less important. All of our front-end v2 code is order-independent, so we won't let the message count against us, that way. --- t/psgi_v2.t | 9 +++++---- t/v2writable.t | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 't') diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 9964b477..11b2c794 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -7,6 +7,7 @@ use File::Temp qw/tempdir/; use PublicInbox::MIME; use PublicInbox::Config; use PublicInbox::WWW; +use PublicInbox::MID qw(mids); my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test URI::Escape Plack::Builder); foreach my $mod (@mods) { @@ -46,8 +47,8 @@ local $SIG{__WARN__} = sub { push @warn, @_ }; $mime->header_set(Date => 'Fri, 02 Oct 1993 00:01:00 +0000'); ok($im->add($mime), 'added duplicate-but-different message'); is(scalar(@warn), 1, 'got one warning'); -my @mids = $mime->header_obj->header_raw('Message-Id'); -$new_mid = PublicInbox::MID::mid_clean($mids[0]); +my $mids = mids($mime->header_obj); +$new_mid = $mids->[1]; $im->done; my $cfgpfx = "publicinbox.v2test"; @@ -93,8 +94,8 @@ is(scalar(@warn), 2, 'got another warning'); like($warn[0], qr/mismatched/, 'warned about mismatched messages'); is($warn[0], $warn[1], 'both warnings are the same'); -@mids = $mime->header_obj->header_raw('Message-Id'); -my $third = PublicInbox::MID::mid_clean($mids[0]); +$mids = mids($mime->header_obj); +my $third = $mids->[-1]; $im->done; test_psgi(sub { $www->call(@_) }, sub { diff --git a/t/v2writable.t b/t/v2writable.t index 6cabf0d5..c48f060e 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -79,8 +79,8 @@ if ('ensure git configs are correct') { ok($im->add($mime), 'reused mid ok'); like(join(' ', @warn), qr/reused/, 'warned about reused MID'); my @mids = $mime->header_obj->header_raw('Message-Id'); - is($mids[1], '', 'original mid not changed'); - like($mids[0], $sane_mid, 'new MID added'); + is($mids[0], '', 'original mid not changed'); + like($mids[1], $sane_mid, 'new MID added'); is(scalar(@mids), 2, 'only one new MID added'); @warn = (); @@ -95,8 +95,8 @@ if ('ensure git configs are correct') { ok($im->add($mime), 'random MID made'); like(join(' ', @warn), qr/using random/, 'warned about using random'); @mids = $mime->header_obj->header_raw('Message-Id'); - is($mids[1], '', 'original mid not changed'); - like($mids[0], $sane_mid, 'new MID added'); + is($mids[0], '', 'original mid not changed'); + like($mids[1], $sane_mid, 'new MID added'); is(scalar(@mids), 2, 'only one new MID added'); @warn = (); -- cgit v1.2.3-24-ge0c7