v2: generate better Message-IDs for duplicates

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

diff --git a/t/v2writable.t b/t/v2writable.t
index e49c06b98c0efde79faf596f22891bddc0cdc084..d37fb06eae1bdf08582db8ec5771d1841e68a793 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -68,7 +68,7 @@ if ('ensure git configs are correct') {
                [ $sec->header_obj->header_raw('Message-Id') ],
                'no new Message-Id added');
 
-       my $sane_mid = qr/\A<[\w\-]+\@localhost>\z/;
+       my $sane_mid = qr/\A<[\w\-\.]+\@\w+>\z/;
        @warn = ();
        $mime->header_set('Message-Id', '<a-mid@b>');
        $mime->body_set('different');
@@ -82,7 +82,8 @@ if ('ensure git configs are correct') {
        @warn = ();
        $mime->header_set('Message-Id', '<a-mid@b>');
        $mime->body_set('this one needs a random mid');
-       my $gen = PublicInbox::Import::digest2mid(content_digest($mime));
+       my $hdr = $mime->header_obj;
+       my $gen = PublicInbox::Import::digest2mid(content_digest($mime), $hdr);
        unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id');
        my $fake = PublicInbox::MIME->new($mime->as_string);
        $fake->header_set('Message-Id', "<$gen>");
@@ -108,14 +109,13 @@ if ('ensure git configs are correct') {
        $mime->header_set('References', '<zz-mid@b>');
        ok($im->add($mime), 'message with multiple Message-ID');
        $im->done;
-       my @found;
        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');
-       $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');
+       my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 });
+       is($mset1->size, 1, 'message found by first MID');
+       my $mset2 = $srch->reopen->query('m:abcde@2', { mset => 1 });
+       is($mset2->size, 1, 'message found by second MID');
+       is((($mset1->items)[0])->get_docid, (($mset2->items)[0])->get_docid,
+               'same document');
 }
 
 SKIP: {
@@ -214,20 +214,22 @@ EOF
        $im = PublicInbox::V2Writable->new($ibx, 1);
        is($im->{partitions}, 1, 'detected single partition from previous');
        my $smsg = $im->remove($mime, 'test removal');
-       my @after = $git0->qx(qw(log --pretty=oneline));
        $im->done;
+       my @after = $git0->qx(qw(log --pretty=oneline));
        my $tip = shift @after;
        like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
-               'commit message propaged to git');
+               'commit message propagated to git');
        is_deeply(\@after, \@before, 'only one commit written to git');
        is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid');
-       like($smsg->num, qr/\A\d+\z/, 'numeric number in return message');
-       is($ibx->mm->mid_for($smsg->num), undef, 'no longer in Msgmap by num');
+       my $num = $smsg->{num};
+       like($num, qr/\A\d+\z/, 'numeric number in return message');
+       is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num');
        my $srch = $ibx->search->reopen;
-       my @found = ();
-       $srch->each_smsg_by_mid($smsg->mid, sub { push @found, @_; 1 });
-       is(scalar(@found), 0, 'no longer found in Xapian skeleton');
+       my $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
+       is($mset->size, 0, 'no longer found in Xapian');
        my @log1 = qw(log -1 --pretty=raw --raw -r --no-abbrev --no-renames);
+       is($srch->{over_ro}->get_art($num), undef,
+               'removal propagated to Over DB');
 
        my $after = $git0->qx(@log1);
        if ($after =~ m!( [a-f0-9]+ )A\td$!m) {