X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fextsearch.t;h=03bcad95ee5b162bcddb922bb640d6565a49f46c;hb=155ee9cdaffd6232ef3c774d1a9f61d708fc8d6e;hp=09cbdabee6c4f0962936bcf39a6cf2fe5ea275a1;hpb=3eec2f7792040f75f3988c520f308e2445baf645;p=public-inbox.git

diff --git a/t/extsearch.t b/t/extsearch.t
index 09cbdabe..03bcad95 100644
--- a/t/extsearch.t
+++ b/t/extsearch.t
@@ -13,8 +13,6 @@ require PublicInbox::Search;
 use_ok 'PublicInbox::ExtSearch';
 use_ok 'PublicInbox::ExtSearchIdx';
 use_ok 'PublicInbox::OverIdx';
-my $sock = tcp_server();
-my $host_port = tcp_host_port($sock);
 my ($home, $for_destroy) = tmpdir();
 local $ENV{HOME} = $home;
 mkdir "$home/.public-inbox" or BAIL_OUT $!;
@@ -125,6 +123,8 @@ EOF
 
 SKIP: {
 	require_mods(qw(Net::NNTP), 1);
+	my $sock = tcp_server();
+	my $host_port = tcp_host_port($sock);
 	my ($out, $err) = ("$home/nntpd.out.log", "$home/nntpd.err.log");
 	my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
 	my $td = start_script($cmd, undef, { 3 => $sock });
@@ -309,12 +309,17 @@ if ('reindex catches missed messages') {
 	is($oidx->eidx_meta($lc_key), $cmt_b, 'lc-v2 stays unchanged');
 	my @err = split(/^/, $err);
 	is(scalar(@err), 1, 'only one warning') or diag "err=$err";
-	like($err[0], qr/I: reindex_unseen/, 'got reindex_unseen message');
+	like($err[0], qr/# reindex_unseen/, 'got reindex_unseen message');
 	my $new = $oidx->get_art($max + 1);
 	is($new->{subject}, $eml->header('Subject'), 'new message added');
 
 	$es->{xdb}->reopen;
-	my $mset = $es->mset("mid:$new->{mid}");
+	# git patch-id --stable <t/data/0001.patch | awk '{print $1}'
+	my $patchid = '91ee6b761fc7f47cad9f2b09b10489f313eb5b71';
+	my $mset = $es->search->mset("patchid:$patchid");
+	is($mset->size, 1, 'patchid search works');
+
+	$mset = $es->mset("mid:$new->{mid}");
 	is($mset->size, 1, 'previously unseen, now indexed in Xapian');
 
 	ok($im->remove($eml), 'remove new message from v2 inbox');
@@ -410,8 +415,8 @@ if ('remove v1test and test gc') {
 	my $opt = { 2 => \(my $err = '') };
 	ok(run_script([qw(-extindex --gc), "$home/extindex"], undef, $opt),
 		'extindex --gc');
-	like($err, qr/^I: remove #1 v1\.example /ms, 'removed v1 message');
-	is(scalar(grep(!/^I:/, split(/^/m, $err))), 0,
+	like($err, qr/^# remove #1 v1\.example /ms, 'removed v1 message');
+	is(scalar(grep(!/^#/, split(/^/m, $err))), 0,
 		'no non-informational messages');
 	$misc->{xdb}->reopen;
 	@it = $misc->mset('')->items;