lazy load Xapian and make it optional for v2

[public-inbox.git] / t / search.t

diff --git a/t/search.t b/t/search.t
index 3c758e68b7388408635f6d3747d13e096675e9d7..a9d0c92030e1a936a5e7d5a77b4b22c65d5645c1 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -3,8 +3,9 @@
 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);
@@ -12,7 +13,7 @@ my $git_dir = "$tmpdir/a.git";
 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) };
+eval { PublicInbox::Search->new($git_dir)->xdb };
 ok($@, "exception raised on non-existent DB");
 
 my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
@@ -223,7 +224,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 +342,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 +359,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 +423,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 +431,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,
+       is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask,
                "sharedRepository respected for $bn");
 }