v2writable: remove "resent" message for duplicate Message-IDs

[public-inbox.git] / t / v2writable.t

diff --git a/t/v2writable.t b/t/v2writable.t
index a5c982e90be592c735870e28f11aeb4e41f1e1da..85b48d2affff215f01951b67ebdfc9ebb0b8fb15 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -57,7 +57,7 @@ if ('ensure git configs are correct') {
        my @warn;
        local $SIG{__WARN__} = sub { push @warn, @_ };
        is($im->add($mime), undef, 'obvious duplicate rejected');
-       like(join(' ', @warn), qr/resent/, 'warned about resent message');
+       is(scalar(@warn), 0, 'no warning about resent message');
 
        @warn = ();
        $mime->header_set('Message-Id', '<a-mid@b>', '<c@d>');
@@ -68,6 +68,7 @@ if ('ensure git configs are correct') {
                [ $mime->header_obj->header_raw('Message-Id') ],
                'no new Message-Id added');
 
+       my $sane_mid = qr/\A<[\w\-]+\@localhost>\z/;
        @warn = ();
        $mime->header_set('Message-Id', '<a-mid@b>');
        $mime->body_set('different');
@@ -75,13 +76,14 @@ if ('ensure git configs are correct') {
        like(join(' ', @warn), qr/reused/, 'warned about reused MID');
        my @mids = $mime->header_obj->header_raw('Message-Id');
        is($mids[1], '<a-mid@b>', 'original mid not changed');
-       like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
+       like($mids[0], $sane_mid, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
        $mime->header_set('Message-Id', '<a-mid@b>');
        $mime->body_set('this one needs a random mid');
-       my $gen = content_digest($mime)->hexdigest . '@localhost';
+       my $gen = PublicInbox::Import::digest2mid(content_digest($mime));
+       unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id');
        my $fake = PublicInbox::MIME->new($mime->as_string);
        $fake->header_set('Message-Id', $gen);
        ok($im->add($fake), 'fake added easily');
@@ -90,14 +92,14 @@ if ('ensure git configs are correct') {
        like(join(' ', @warn), qr/using random/, 'warned about using random');
        @mids = $mime->header_obj->header_raw('Message-Id');
        is($mids[1], '<a-mid@b>', 'original mid not changed');
-       like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
+       like($mids[0], $sane_mid, 'new MID added');
        is(scalar(@mids), 2, 'only one new MID added');
 
        @warn = ();
        $mime->header_set('Message-Id');
        ok($im->add($mime), 'random MID made for MID free message');
        @mids = $mime->header_obj->header_raw('Message-Id');
-       like($mids[0], qr/\A<\w+\@localhost>\z/, 'mid was generated');
+       like($mids[0], $sane_mid, 'mid was generated');
        is(scalar(@mids), 1, 'new generated');
 }
 
@@ -106,10 +108,10 @@ if ('ensure git configs are correct') {
        ok($im->add($mime), 'message with multiple Message-ID');
        $im->done;
        my @found;
-       $ibx->search->reopen;
-       $ibx->search->each_smsg_by_mid('abcde@1', sub { push @found, @_; 1 });
+       my $srch = $ibx->search;
+       $srch->reopen->each_smsg_by_mid('abcde@1', sub { push @found, @_; 1 });
        is(scalar(@found), 1, 'message found by first MID');
-       $ibx->search->each_smsg_by_mid('abcde@2', sub { push @found, @_; 1 });
+       $srch->reopen->each_smsg_by_mid('abcde@2', sub { push @found, @_; 1 });
        is(scalar(@found), 2, 'message found by second MID');
        is($found[0]->{doc_id}, $found[1]->{doc_id}, 'same document');
        ok($found[1]->{doc_id} > 0, 'doc_id is positive');
@@ -210,12 +212,19 @@ EOF
        is(scalar(@found), 0, 'no longer found in Xapian skeleton');
 
        my $after = $git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev));
-       if ($after =~ m!( [a-f0-9]+ )A\td$!) {
+       if ($after =~ m!( [a-f0-9]+ )A\t_/D$!) {
                my $oid = $1;
                ok(index($before, $oid) > 0, 'no new blob introduced');
        } else {
                fail('failed to extract blob from log output');
        }
+       is($im->remove($mime, 'test removal'), undef,
+               'remove is idempotent');
+       $im->done;
+       is($git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev)),
+               $after, 'no git history made with idempotent remove');
+       eval { $im->done };
+       ok(!$@, '->done is idempotent');
 }
 
 done_testing();