X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=4a42c016538bebc6d1efe5184cfbdd611dbe004c;hb=fad9acd35e56a289ade90a62d056b2a6663d448c;hp=a5c982e90be592c735870e28f11aeb4e41f1e1da;hpb=7a3a4b9d310876f68f4ba788afaef77ad15fc62b;p=public-inbox.git diff --git a/t/v2writable.t b/t/v2writable.t index a5c982e9..4a42c016 100644 --- a/t/v2writable.t +++ b/t/v2writable.t @@ -43,13 +43,9 @@ if ('ensure git configs are correct') { qw(core.sharedRepository 0644)); is(system(@cmd), 0, "set sharedRepository in all.git"); $git0 = PublicInbox::Git->new("$mainrepo/git/0.git"); - my $fh = $git0->popen(qw(config core.sharedRepository)); - my $v = eval { local $/; <$fh> }; - chomp $v; + chomp(my $v = $git0->qx(qw(config core.sharedRepository))); is($v, '0644', 'child repo inherited core.sharedRepository'); - $fh = $git0->popen(qw(config --bool repack.writeBitmaps)); - $v = eval { local $/; <$fh> }; - chomp $v; + chomp($v = $git0->qx(qw(config --bool repack.writeBitmaps))); is($v, 'true', 'child repo inherited repack.writeBitmaps'); } @@ -57,62 +53,68 @@ 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', '', ''); - ok($im->add($mime), 'secondary MID used'); + is($im->add($mime), undef, 'secondary MID ignored if first matches'); + my $sec = PublicInbox::MIME->new($mime->as_string); + $sec->header_set('Date'); + $sec->header_set('Message-Id', '', ''); + ok($im->add($sec), 'secondary MID used if data is different'); like(join(' ', @warn), qr/mismatched/, 'warned about mismatch'); like(join(' ', @warn), qr/alternative/, 'warned about alternative'); is_deeply([ '', '' ], - [ $mime->header_obj->header_raw('Message-Id') ], + [ $sec->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', ''); $mime->body_set('different'); 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], qr/\A<\w+\@localhost>\z/, '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 = (); $mime->header_set('Message-Id', ''); $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); + $fake->header_set('Message-Id', "<$gen>"); ok($im->add($fake), 'fake added easily'); is_deeply(\@warn, [], 'no warnings from a faker'); 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], qr/\A<\w+\@localhost>\z/, '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 = (); $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'); } { $mime->header_set('Message-Id', '', ''); + $mime->header_set('References', ''); 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 }); - is(scalar(@found), 1, 'message found by first MID'); - $ibx->search->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 $srch = $ibx->search; + 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: { @@ -187,6 +189,22 @@ EOF is($nn{$mid}++, 0, "MID is unique in NEWNEWS"); } is_deeply([sort keys %nn], [sort keys %uniq]); + + my %lg; + foreach my $num (@{$n->listgroup($group)}) { + is($lg{$num}++, 0, "num is unique in LISTGROUP"); + } + is_deeply([sort keys %lg], [sort keys %$x], + 'XOVER and LISTGROUPS return the same article numbers'); + + my $xref = $n->xhdr('Xref', '1-'); + is_deeply([sort keys %lg], [sort keys %$xref], 'Xref range OK'); + + my $mids = $n->xhdr('Message-ID', '1-'); + is_deeply([sort keys %lg], [sort keys %$xref], 'Message-ID range OK'); + + my $rover = $n->xrover('1-'); + is_deeply([sort keys %lg], [sort keys %$rover], 'XROVER range OK'); }; { local $ENV{NPROC} = 2; @@ -199,23 +217,62 @@ EOF $im->done; 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 $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($smsg->num), undef, + 'removal propagated to Over DB'); - my $after = $git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev)); - if ($after =~ m!( [a-f0-9]+ )A\td$!) { + my $after = $git0->qx(@log1); + if ($after =~ m!( [a-f0-9]+ )A\td$!m) { 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(@log1), + $after, 'no git history made with idempotent remove'); + eval { $im->done }; + ok(!$@, '->done is idempotent'); +} + +{ + ok($im->add($mime), 'add message to be purged'); + local $SIG{__WARN__} = sub {}; + ok(my $cmts = $im->purge($mime), 'purged message'); + like($cmts->[0], qr/\A[a-f0-9]{40}\z/, 'purge returned current commit'); + $im->done; +} + +{ + my @warn; + my $x = 'x'x250; + my $y = 'y'x250; + local $SIG{__WARN__} = sub { push @warn, @_ }; + $mime->header_set('Subject', 'long mid'); + $mime->header_set('Message-ID', "<$x>"); + ok($im->add($mime), 'add excessively long Message-ID'); + + $mime->header_set('Message-ID', "<$y>"); + $mime->header_set('References', "<$x>"); + ok($im->add($mime), 'add excessively long References'); + $im->barrier; + + my $msgs = $ibx->search->reopen->get_thread('x'x244); + is(2, scalar(@$msgs), 'got both messages'); + is($msgs->[0]->{mid}, 'x'x244, 'stored truncated mid'); + is($msgs->[1]->{references}, '<'.('x'x244).'>', 'stored truncated ref'); + is($msgs->[1]->{mid}, 'y'x244, 'stored truncated mid(2)'); + $im->done; } done_testing();