testcommon: add require_mods method and use it

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

diff --git a/t/search.t b/t/search.t
index c063620c4d1a52b051bfc800057ed7f877d5f7fa..c40e1363d07b7b91b77568ef0988ec8f9d25b9be 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -1,60 +1,61 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-my @mods = qw(DBI DBD::SQLite Search::Xapian);
-foreach my $mod (@mods) {
-       eval "require $mod";
-       plan skip_all => "missing $mod for $0" if $@;
-};
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite Search::Xapian));
 require PublicInbox::SearchIdx;
-use File::Temp qw/tempdir/;
+require PublicInbox::Inbox;
 use Email::MIME;
-my $tmpdir = tempdir('pi-search-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 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)->xdb };
+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 {
@@ -450,7 +451,7 @@ foreach my $f ("$git_dir/public-inbox/msgmap.sqlite3",
                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,
+       oct_is($st[2] & $all_mask, -f _ ? 0660 : $dir_mask,
                "sharedRepository respected for $bn");
 }