body => "hello world\n",
);
-my $im = PublicInbox::V2Writable->new($ibx, 1);
+my $im = eval {
+ local $ENV{NPROC} = '1';
+ PublicInbox::V2Writable->new($ibx, 1);
+};
+is($im->{partitions}, 1, 'one partition when forced');
ok($im->add($mime), 'ordinary message added');
+my $git0;
if ('ensure git configs are correct') {
my @cmd = (qw(git config), "--file=$mainrepo/all.git/config",
qw(core.sharedRepository 0644));
is(system(@cmd), 0, "set sharedRepository in all.git");
- my $git0 = PublicInbox::Git->new("$mainrepo/git/0.git");
+ $git0 = PublicInbox::Git->new("$mainrepo/git/0.git");
my $fh = $git0->popen(qw(config core.sharedRepository));
my $v = eval { local $/; <$fh> };
chomp $v;
{
my @warn;
local $SIG{__WARN__} = sub { push @warn, @_ };
- is(undef, $im->add($mime), 'obvious duplicate rejected');
- like(join(' ', @warn), qr/resent/, 'warned about resent message');
+ is($im->add($mime), undef, 'obvious duplicate rejected');
+ is(scalar(@warn), 0, 'no warning about resent message');
@warn = ();
$mime->header_set('Message-Id', '<a-mid@b>', '<c@d>');
- 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', '<a-mid@b>', '<c@d>');
+ 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([ '<a-mid@b>', '<c@d>' ],
- [ $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', '<a-mid@b>');
$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], '<a-mid@b>', 'original mid not changed');
- like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
+ is($mids[0], '<a-mid@b>', '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', '<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);
+ $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], '<a-mid@b>', 'original mid not changed');
- like($mids[0], qr/\A<\w+\@localhost>\z/, 'new MID added');
+ is($mids[0], '<a-mid@b>', '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');
}
ok($im->add($mime), 'message with multiple Message-ID');
$im->done;
my @found;
- $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');
}
is_deeply([sort keys %nn], [sort keys %uniq]);
};
+{
+ local $ENV{NPROC} = 2;
+ my @before = $git0->qx(qw(log --pretty=oneline));
+ my $before = $git0->qx(qw(log --pretty=raw --raw -r --no-abbrev));
+ $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 $tip = shift @after;
+ like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
+ 'commit message propaged 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 $after = $git0->qx(qw(log -1 --pretty=raw --raw -r --no-abbrev));
+ 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');
+}
+
+{
+ ok($im->add($mime), 'add message to be purged');
+ local $SIG{__WARN__} = sub {};
+ ok($im->purge($mime), 'purged message');
+ $im->done;
+}
done_testing();