X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Faltid_v2.t;h=281a09d51dd0cfe4af5ed0b5590ec97b8a74b68c;hb=refs%2Fheads%2Fmaster;hp=493982a115b094ff01ecc9f88b70a69facb16190;hpb=28840e0ea63f8d649614e196ce286688be431dfb;p=public-inbox.git

diff --git a/t/altid_v2.t b/t/altid_v2.t
index 493982a1..c62252c1 100644
--- a/t/altid_v2.t
+++ b/t/altid_v2.t
@@ -5,18 +5,18 @@ use strict;
 use v5.10.1;
 use PublicInbox::TestCommon;
 use PublicInbox::Eml;
-use PublicInbox::Msgmap;
 require_git(2.6);
 require_mods(qw(DBD::SQLite Search::Xapian));
+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", 1);
-	$mm->mid_set(1234, 'a@example.com') == 1 or BAIL_OUT 'mid_set once';
-	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 $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;
 From: a@example.com
 To: b@example.com
@@ -26,9 +26,9 @@ Message-ID: <a@example.com>
 hello world gmane:666
 EOF
 };
-my $mm = PublicInbox::Msgmap->new_file("$ibx->{inboxdir}/$another", 1);
-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 $mm = PublicInbox::Msgmap->new_file("$ibx->{inboxdir}/$another", 2);
+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');
 my $mset = $ibx->search->mset('gmane:1234');
 my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
 $msgs = [ map { $_->{mid} } @$msgs ];