-use_ok 'PublicInbox::V2Writable';
-use_ok 'PublicInbox::Inbox';
-my ($tmpdir, $for_destroy) = tmpdir();
-my $inboxdir = "$tmpdir/inbox";
-my $full = "$tmpdir/inbox/another-nntp.sqlite3";
-my $altid = [ 'serial:gmane:file=another-nntp.sqlite3' ];
-
-{
- ok(mkdir($inboxdir), 'created repo for msgmap');
- my $mm = PublicInbox::Msgmap->new_file($full, 1);
- is($mm->mid_set(1234, 'a@example.com'), 1, 'mid_set once OK');
- ok(0 == $mm->mid_set(1234, 'a@example.com'), 'mid_set not idempotent');
- ok(0 == $mm->mid_set(1, 'a@example.com'), 'mid_set fails with dup MID');
-}
-
-my $ibx = {
- inboxdir => $inboxdir,
- name => 'test-v2writable',
- version => 2,
- -primary_address => 'test@example.com',
- altid => $altid,
-};
-$ibx = PublicInbox::Inbox->new($ibx);
-my $v2w = PublicInbox::V2Writable->new($ibx, 1);
-$v2w->add(PublicInbox::Eml->new(<<'EOF'));
+require PublicInbox::Msgmap;
+my $another = 'another-nntp.sqlite3';
+my $altid = [ "serial:gmane:file=$another" ];
+my $ibx = create_inbox 'v2', version => 2, indexlevel => 'medium',
+ altid => $altid, sub {
+ my ($im, $ibx) = @_;
+ my $mm = PublicInbox::Msgmap->new_file("$ibx->{inboxdir}/$another", 2);
+ is($mm->mid_set(1234, 'a@example.com'), 1, 'mid_set') or xbail 'once';
+ is($mm->mid_set(1234, 'a@example.com')+0, 0, 'mid_set not idempotent');
+ is($mm->mid_set(1, 'a@example.com')+0, 0, 'mid_set fails with dup MID');
+ $im->add(PublicInbox::Eml->new(<<'EOF')) or BAIL_OUT;