$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);
# 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');
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
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 $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);
});
{
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");
}
}
$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);
}
}
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');
-
- my $mid = $n->[0]->mid;
- my ($id, $prev);
- my $art = $ro->next_by_mid($mid, \$id, \$prev);
- ok($art, 'article exists in OVER DB');
+ 'search inside text attachments works') if scalar(@$txt);
+
+ my $art;
+ if (scalar(@$n) >= 1) {
+ my $mid = $n->[0]->mid;
+ my ($id, $prev);
+ $art = $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');
+ 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] & 07777, -f _ ? 0660 : 02770,
+ is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask,
"sharedRepository respected for $bn");
}