X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch.t;h=b6531ab37bf5c4009f310aaa628a4991230c9e7e;hb=420fddb8b683637cc1fd39727896cac4a459c3b6;hp=3c758e68b7388408635f6d3747d13e096675e9d7;hpb=29072fb327da93cff00ce4970e9c8de23ef0a618;p=public-inbox.git
diff --git a/t/search.t b/t/search.t
index 3c758e68..b6531ab3 100644
--- a/t/search.t
+++ b/t/search.t
@@ -1,56 +1,65 @@
-# Copyright (C) 2015-2018 all contributors
+# Copyright (C) 2015-2019 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-eval { require PublicInbox::SearchIdx; };
-plan skip_all => "Xapian missing for search" if $@;
+my @mods = qw(DBI DBD::SQLite Search::Xapian);
+foreach my $mod (@mods) {
+ eval "require $mod";
+ plan skip_all => "missing $mod for $0" if $@;
+};
+require PublicInbox::SearchIdx;
+require PublicInbox::Inbox;
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 $ibx = PublicInbox::Inbox->new({ inboxdir => $git_dir });
my ($root_id, $last_id);
-is(0, system(qw(git init --shared -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)")
+ or BAIL_OUT("`git init --shared' failed, weird FS or seccomp?");
+eval { PublicInbox::Search->new($ibx)->xdb };
ok($@, "exception raised on non-existent DB");
-my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
-my $ibx = $rw->{-inbox};
+my $rw = PublicInbox::SearchIdx->new($ibx, 1);
$ibx->with_umask(sub {
$rw->_xdb_acquire;
$rw->_xdb_release;
});
$rw = undef;
-my $ro = PublicInbox::Search->new($git_dir);
+my $ro = PublicInbox::Search->new($ibx);
my $rw_commit = sub {
$rw->commit_txn_lazy if $rw;
- $rw = PublicInbox::SearchIdx->new($git_dir, 1);
+ $rw = PublicInbox::SearchIdx->new($ibx, 1);
+ $rw->{qp_flags} = 0; # quiet a warning
$rw->begin_txn_lazy;
};
+sub oct_is ($$$) {
+ my ($got, $exp, $msg) = @_;
+ is(sprintf('0%03o', $got), sprintf('0%03o', $exp), $msg);
+}
+
{
# git repository perms
- is($ibx->_git_config_perm(), &PublicInbox::InboxWritable::PERM_GROUP,
- "undefined permission is group");
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('0644')),
- 0022, "644 => umask(0022)");
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('0600')),
- 0077, "600 => umask(0077)");
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('0640')),
- 0027, "640 => umask(0027)");
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('group')),
- 0007, 'group => umask(0007)');
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('everybody')),
- 0002, 'everybody => umask(0002)');
- is(PublicInbox::InboxWritable::_umask_for(
- PublicInbox::InboxWritable->_git_config_perm('umask')),
- umask, 'umask => existing umask');
+ oct_is($ibx->_git_config_perm(),
+ &PublicInbox::InboxWritable::PERM_GROUP,
+ 'undefined permission is group');
+ my @t = (
+ [ '0644', 0022, '644 => umask(0022)' ],
+ [ '0600', 0077, '600 => umask(0077)' ],
+ [ '0640', 0027, '640 => umask(0027)' ],
+ [ 'group', 0007, 'group => umask(0007)' ],
+ [ 'everybody', 0002, 'everybody => umask(0002)' ],
+ [ 'umask', umask, 'umask => existing umask' ],
+ );
+ for (@t) {
+ my ($perm, $exp, $msg) = @$_;
+ my $got = PublicInbox::InboxWritable::_umask_for(
+ PublicInbox::InboxWritable->_git_config_perm($perm));
+ oct_is($got, $exp, $msg);
+ }
}
$ibx->with_umask(sub {
@@ -223,7 +232,7 @@ $ibx->with_umask(sub {
$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);
@@ -341,7 +350,7 @@ $ibx->with_umask(sub {
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");
}
}
@@ -358,16 +367,18 @@ $ibx->with_umask(sub {
$res = $ro->query('q:theatre');
is(scalar(@$res), 1, 'only one quoted body');
- like($res->[0]->from, qr/\AQuoter/, 'got quoted body') if scalar(@$res);
+ 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') if scalar(@$res);
+ 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/,
+ like($res->[0]->from_name, qr/\ANon-Quoter/,
"non-quoter first for $pfx") if scalar(@$res);
}
}
@@ -420,7 +431,7 @@ $ibx->with_umask(sub {
if (scalar(@$n) >= 1) {
my $mid = $n->[0]->mid;
my ($id, $prev);
- $art = $ro->next_by_mid($mid, \$id, \$prev);
+ $art = $ro->{over_ro}->next_by_mid($mid, \$id, \$prev);
ok($art, 'article exists in OVER DB');
}
$rw->unindex_blob($amsg);
@@ -428,13 +439,23 @@ $ibx->with_umask(sub {
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,
+ oct_is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask,
"sharedRepository respected for $bn");
}