X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch.t;h=a9d0c92030e1a936a5e7d5a77b4b22c65d5645c1;hb=0b1de991a099b5e8b9a9e3e85b5eaaacc9362dbb;hp=516f5670b0156b889ea3f2b4016e715944b41436;hpb=3348ad4b3b1a0865ee58a902953165ea0f4aa4bd;p=public-inbox.git

diff --git a/t/search.t b/t/search.t
index 516f5670..a9d0c920 100644
--- a/t/search.t
+++ b/t/search.t
@@ -3,22 +3,25 @@
 use strict;
 use warnings;
 use Test::More;
-eval { require PublicInbox::SearchIdx; };
-plan skip_all => "Xapian missing for search" if $@;
+eval { require Search::Xapian };
+plan skip_all => "Search::Xapian missing for search" if $@;
+require PublicInbox::SearchIdx;
 use File::Temp qw/tempdir/;
 use Email::MIME;
 my $tmpdir = tempdir('pi-search-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $git_dir = "$tmpdir/a.git";
 my ($root_id, $last_id);
 
-is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
-eval { PublicInbox::Search->new($git_dir) };
+is(0, system(qw(git init --shared -q --bare), $git_dir), "git init (main)");
+eval { PublicInbox::Search->new($git_dir)->xdb };
 ok($@, "exception raised on non-existent DB");
 
 my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
-$rw->_xdb_acquire;
-$rw->_xdb_release;
 my $ibx = $rw->{-inbox};
+$ibx->with_umask(sub {
+	$rw->_xdb_acquire;
+	$rw->_xdb_release;
+});
 $rw = undef;
 my $ro = PublicInbox::Search->new($git_dir);
 my $rw_commit = sub {
@@ -51,7 +54,7 @@ my $rw_commit = sub {
 	   umask, 'umask => existing umask');
 }
 
-{
+$ibx->with_umask(sub {
 	my $root = Email::MIME->create(
 		header_str => [
 			Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
@@ -79,7 +82,7 @@ my $rw_commit = sub {
 	is($root_id, int($root_id), "root_id is an integer: $root_id");
 	$last_id = $rw->add_message($last);
 	is($last_id, int($last_id), "last_id is an integer: $last_id");
-}
+});
 
 sub filter_mids {
 	my ($msgs) = @_;
@@ -91,7 +94,7 @@ sub filter_mids {
 	$ro->reopen;
 	my $found = $ro->query('m:root@s');
 	is(scalar(@$found), 1, "message found");
-	is($found->[0]->mid, 'root@s', 'mid set correctly');
+	is($found->[0]->mid, 'root@s', 'mid set correctly') if scalar(@$found);
 
 	my ($res, @res);
 	my @exp = sort qw(root@s last@s);
@@ -116,7 +119,7 @@ sub filter_mids {
 }
 
 # ghost vivication
-{
+$ibx->with_umask(sub {
 	$rw_commit->();
 	my $rmid = '<ghost-message@s>';
 	my $reply_to_ghost = Email::MIME->create(
@@ -153,7 +156,7 @@ sub filter_mids {
 	}
 	isnt($msgs->[0]->{num}, $msgs->[1]->{num}, "num do not match");
 	ok($_->{num} > 0, 'positive art num') foreach @$msgs
-}
+});
 
 # search thread on ghost
 {
@@ -168,7 +171,8 @@ sub filter_mids {
 
 	# body
 	$res = $ro->query('goodbye');
-	is($res->[0]->mid, 'last@s', 'got goodbye message body');
+	is(scalar(@$res), 1, "goodbye message found");
+	is($res->[0]->mid, 'last@s', 'got goodbye message body') if scalar(@$res);
 
 	# datestamp
 	$res = $ro->query('dt:20101002000001..20101002000001');
@@ -179,7 +183,7 @@ sub filter_mids {
 }
 
 # long message-id
-{
+$ibx->with_umask(sub {
 	$rw_commit->();
 	$ro->reopen;
 	my $long_mid = 'last' . ('x' x 60). '@s';
@@ -212,7 +216,7 @@ sub filter_mids {
 			# No References:
 			# 'References' => '<root@s> <last@s> <'.$long_mid.'>',
 			'In-Reply-To' => "<$long_mid>",
-			From => '"no1 <no1@example.com>',
+			From => 'no1 <no1@example.com>',
 			To => 'list@example.com',
 		],
 		body => "no References\n");
@@ -220,15 +224,15 @@ sub filter_mids {
 
 	$rw_commit->();
 	$ro->reopen;
-	my $t = $ro->get_thread('root@s');
+	my $t = $ro->{over_ro}->get_thread('root@s');
 	is(scalar(@$t), 4, "got all 4 mesages in thread");
 	my @exp = sort($long_reply_mid, 'root@s', 'last@s', $long_mid);
 	@res = filter_mids($t);
 	is_deeply(\@res, \@exp, "get_thread works");
-}
+});
 
 # quote prioritization
-{
+$ibx->with_umask(sub {
 	$rw_commit->();
 	$rw->add_message(Email::MIME->create(
 		header_str => [
@@ -251,17 +255,17 @@ sub filter_mids {
 		body => "theatre\nfade\n"));
 	my $res = $rw->query("theatre");
 	is(scalar(@$res), 2, "got both matches");
-	is($res->[0]->mid, 'nquote@a', "non-quoted scores higher");
-	is($res->[1]->mid, 'quote@a', "quoted result still returned");
+	is($res->[0]->mid, 'nquote@a', "non-quoted scores higher") if scalar(@$res);
+	is($res->[1]->mid, 'quote@a', "quoted result still returned") if scalar(@$res);
 
 	$res = $rw->query("illusions");
 	is(scalar(@$res), 1, "got a match for quoted text");
 	is($res->[0]->mid, 'quote@a',
-		"quoted result returned if nothing else");
-}
+		"quoted result returned if nothing else") if scalar(@$res);
+});
 
 # circular references
-{
+$ibx->with_umask(sub {
 	my $s = 'foo://'. ('Circle' x 15).'/foo';
 	my $doc_id = $rw->add_message(Email::MIME->create(
 		header => [ Subject => $s ],
@@ -276,11 +280,12 @@ sub filter_mids {
 		body => "LOOP!\n"));
 	ok($doc_id > 0, "doc_id defined with circular reference");
 	my $smsg = $rw->query('m:circle@a', {limit=>1})->[0];
-	is($smsg->references, '', "no references created");
-	is($s, $smsg->subject, 'long subject not rewritten');
-}
+	is(defined($smsg), 1, 'found m:circl@a');
+	is($smsg->references, '', "no references created") if defined($smsg);
+	is($smsg->subject, $s, 'long subject not rewritten') if defined($smsg);
+});
 
-{
+$ibx->with_umask(sub {
 	my $str = eval {
 		my $mbox = 't/utf8.mbox';
 		open(my $fh, '<', $mbox) or die "failed to open mbox: $mbox\n";
@@ -292,8 +297,9 @@ sub filter_mids {
 	my $doc_id = $rw->add_message($mime);
 	ok($doc_id > 0, 'message indexed doc_id with UTF-8');
 	my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0];
-	is($mime->header('Subject'), $msg->subject, 'UTF-8 subject preserved');
-}
+	is(defined($msg), 1, 'found testmessage@example.com');
+	is($mime->header('Subject'), $msg->subject, 'UTF-8 subject preserved') if defined($msg);
+});
 
 {
 	my $msgs = $ro->query('d:19931002..20101002');
@@ -336,7 +342,7 @@ sub filter_mids {
 		is(scalar(@$res), 1,
 			"searched $pfx successfully for From:");
 		foreach my $smsg (@$res) {
-			like($smsg->from, qr/Laggy Sender/,
+			like($smsg->from_name, qr/Laggy Sender/,
 				"From appears with $pfx");
 		}
 	}
@@ -353,21 +359,23 @@ sub filter_mids {
 
 	$res = $ro->query('q:theatre');
 	is(scalar(@$res), 1, 'only one quoted body');
-	like($res->[0]->from, qr/\AQuoter/, 'got quoted body');
+	like($res->[0]->from_name, qr/\AQuoter/,
+		'got quoted body') if (scalar(@$res));
 
 	$res = $ro->query('nq:theatre');
 	is(scalar @$res, 1, 'only one non-quoted body');
-	like($res->[0]->from, qr/\ANon-Quoter/, 'got non-quoted body');
+	like($res->[0]->from_name, qr/\ANon-Quoter/,
+		'got non-quoted body') if (scalar(@$res));
 
 	foreach my $pfx (qw(b: bs:)) {
 		$res = $ro->query($pfx . 'theatre');
 		is(scalar @$res, 2, "searched both bodies for $pfx");
-		like($res->[0]->from, qr/\ANon-Quoter/,
-			"non-quoter first for $pfx");
+		like($res->[0]->from_name, qr/\ANon-Quoter/,
+			"non-quoter first for $pfx") if scalar(@$res);
 	}
 }
 
-{
+$ibx->with_umask(sub {
 	my $part1 = Email::MIME->create(
                  attributes => {
                      content_type => 'text/plain',
@@ -405,12 +413,73 @@ sub filter_mids {
 	my $res = $ro->query('part_deux.txt');
 	is(scalar @$res, 1, 'got result without n:');
 	is($n->[0]->mid, $res->[0]->mid,
-		'same result with and without');
+		'same result with and without') if scalar(@$res);
 	my $txt = $ro->query('"inside another"');
+	is(scalar @$txt, 1, 'found inside another');
 	is($txt->[0]->mid, $res->[0]->mid,
-		'search inside text attachments works');
+		'search inside text attachments works') if scalar(@$txt);
+
+	my $art;
+	if (scalar(@$n) >= 1) {
+		my $mid = $n->[0]->mid;
+		my ($id, $prev);
+		$art = $ro->{over_ro}->next_by_mid($mid, \$id, \$prev);
+		ok($art, 'article exists in OVER DB');
+	}
+	$rw->unindex_blob($amsg);
+	$rw->commit_txn_lazy;
+	is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB') if defined($art);
+});
+
+my $all_mask = 07777;
+my $dir_mask = 02770;
+
+# FreeBSD does not allow non-root users to set S_ISGID, so
+# git doesn't set it, either (see DIR_HAS_BSD_GROUP_SEMANTICS in git.git)
+if ($^O =~ /freebsd/i) {
+	$all_mask = 0777;
+	$dir_mask = 0770;
+}
+
+foreach my $f ("$git_dir/public-inbox/msgmap.sqlite3",
+		"$git_dir/public-inbox",
+		glob("$git_dir/public-inbox/xapian*/"),
+		glob("$git_dir/public-inbox/xapian*/*")) {
+	my @st = stat($f);
+	my ($bn) = (split(m!/!, $f))[-1];
+	is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask,
+		"sharedRepository respected for $bn");
 }
-$rw->commit_txn_lazy;
+
+$ibx->with_umask(sub {
+	$rw_commit->();
+	my $digits = '10010260936330';
+	my $ua = 'Pine.LNX.4.10';
+	my $mid = "$ua.$digits.2460-100000\@penguin.transmeta.com";
+	is($ro->reopen->query("m:$digits", { mset => 1})->size, 0,
+		'no results yet');
+	my $pine = Email::MIME->create(
+		header_str => [
+			Subject => 'blah',
+			'Message-ID' => "<$mid>",
+			From => 'torvalds@transmeta',
+			To => 'list@example.com',
+		],
+		body => ""
+	);
+	my $x = $rw->add_message($pine);
+	$rw->commit_txn_lazy;
+	is($ro->reopen->query("m:$digits", { mset => 1})->size, 1,
+		'searching only digit yielded result');
+
+	my $wild = $digits;
+	for my $i (1..6) {
+		chop($wild);
+		is($ro->query("m:$wild*", { mset => 1})->size, 1,
+			"searching chopped($i) digit yielded result $wild ");
+	}
+	is($ro->query("m:Pine m:LNX m:10010260936330", {mset=>1})->size, 1);
+});
 
 done_testing();