remove hard Devel::Peek dependency and lazy load for daemons

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

diff --git a/t/search.t b/t/search.t
index 3c758e68b7388408635f6d3747d13e096675e9d7..35d71473e29a8bf9e71178ed5d774982775dc0ad 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -341,7 +341,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 +358,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);
        }
 }
@@ -428,13 +430,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");
 }