+ my ($total, undef) = $ibx->over->recent;
+ is($ibx->mm->num_highwater, $total, 'got expected highwater value');
+ 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') if ($mset1->size);
+
+ my $alt = $srch->reopen->query('m:alt-id-for-nntp', { mset => 1 });
+ is($alt->size, 1, 'message found by alt MID (NNTP)');
+ is((($alt->items)[0])->get_docid, (($mset1->items)[0])->get_docid,
+ 'same document') if ($mset1->size);
+ $mime->header_set('X-Alt-Message-Id');
+
+ my %uniq;
+ for my $mid (qw(abcde@1 abcde@2 alt-id-for-nntp)) {
+ my $msgs = $ibx->over->get_thread($mid);
+ my $key = join(' ', sort(map { $_->{num} } @$msgs));
+ $uniq{$key}++;
+ }
+ is(scalar(keys(%uniq)), 1, 'all alt Message-ID queries give same smsg');
+ is_deeply([values(%uniq)], [3], '3 queries, 3 results');
+}
+
+{
+ use Net::NNTP;
+ my $err = "$inboxdir/stderr.log";
+ my $out = "$inboxdir/stdout.log";
+ my $group = 'inbox.comp.test.v2writable';
+ my $pi_config = "$inboxdir/pi_config";
+ open my $fh, '>', $pi_config or die "open: $!\n";
+ print $fh <<EOF
+[publicinbox "test-v2writable"]
+ inboxdir = $inboxdir
+ version = 2
+ address = test\@example.com
+ newsgroup = $group
+EOF
+ ;
+ close $fh or die "close: $!\n";
+ my $sock = tcp_server();
+ ok($sock, 'sock created');
+ my $len;
+ my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+ my $env = { PI_CONFIG => $pi_config };
+ my $td = start_script($cmd, $env, { 3 => $sock });
+ my $host_port = $sock->sockhost . ':' . $sock->sockport;
+ my $n = Net::NNTP->new($host_port);
+ $n->group($group);
+ my $x = $n->xover('1-');
+ my %uniq;
+ foreach my $num (sort { $a <=> $b } keys %$x) {
+ my $mid = $x->{$num}->[3];
+ is($uniq{$mid}++, 0, "MID for $num is unique in XOVER");
+ is_deeply($n->xhdr('Message-ID', $num),
+ { $num => $mid }, "XHDR lookup OK on num $num");
+ is_deeply($n->xhdr('Message-ID', $mid),
+ { $mid => $mid }, "XHDR lookup OK on MID $num");
+ }
+ my %nn;
+ foreach my $mid (@{$n->newnews(0, $group)}) {
+ 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');
+};
+{
+ my @log = qw(log --no-decorate --no-abbrev --no-notes --no-color);
+ my @before = $git0->qx(@log, qw(--pretty=oneline));
+ my $before = $git0->qx(@log, qw(--pretty=raw --raw -r));
+ $im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
+ is($im->{shards}, 1, 'detected single shard from previous');
+ my ($mark, $rm_mime, $smsg) = $im->remove($mime, 'test removal');
+ is(content_id($rm_mime), content_id($mime),
+ 'removed object returned matches');
+ ok(defined($mark), 'mark set');
+ $im->done;
+ my @after = $git0->qx(@log, qw(--pretty=oneline));
+ my $tip = shift @after;
+ like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
+ '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');
+ 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 $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
+ is($mset->size, 0, 'no longer found in Xapian');
+ my @log1 = (@log, qw(-1 --pretty=raw --raw -r --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) {
+ 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');