X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fv2writable.t;h=0eda432a81bcb0dd59fc7d9bd21a6527ccf4e797;hb=4790a0dbd7b297e087713c6ff2e63bf7deee4d04;hp=5245a84b1fbcfaea56bfa63c1fe7e7c14b60298c;hpb=d88d35ed7ad85d9b90c8e2e805f0d872df9e32fa;p=public-inbox.git

diff --git a/t/v2writable.t b/t/v2writable.t
index 5245a84b..0eda432a 100644
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -57,15 +57,19 @@ 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', '<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/;
@@ -75,8 +79,8 @@ if ('ensure git configs are correct') {
 	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], $sane_mid, '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 = ();
@@ -85,14 +89,14 @@ if ('ensure git configs are correct') {
 	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], $sane_mid, '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 = ();
@@ -108,10 +112,10 @@ if ('ensure git configs are correct') {
 	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 });
+	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');
@@ -223,6 +227,15 @@ EOF
 	$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();