X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch.t;h=b6531ab37bf5c4009f310aaa628a4991230c9e7e;hb=420fddb8b683637cc1fd39727896cac4a459c3b6;hp=a9d0c92030e1a936a5e7d5a77b4b22c65d5645c1;hpb=0b1de991a099b5e8b9a9e3e85b5eaaacc9362dbb;p=public-inbox.git

diff --git a/t/search.t b/t/search.t
index a9d0c920..b6531ab3 100644
--- a/t/search.t
+++ b/t/search.t
@@ -1,57 +1,65 @@
-# 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;
-eval { require Search::Xapian };
-plan skip_all => "Search::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)->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 {
@@ -447,7 +455,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");
 }