X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsearch.t;h=8508f27301443d28d39a57bd54ed86cd0a38300a;hb=6e07def560b211d9a1a3221862e72b7aeb4a31b3;hp=a049c931c3910b048556f4af7c13d1f0e465ff23;hpb=3b508de80a200e9a32adbdc437434339187dde88;p=public-inbox.git diff --git a/t/search.t b/t/search.t index a049c931..8508f273 100644 --- a/t/search.t +++ b/t/search.t @@ -1,23 +1,21 @@ -# Copyright (C) 2015-2018 all contributors +# Copyright (C) 2015-2020 all contributors # License: AGPL-3.0+ 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; require PublicInbox::Inbox; -use File::Temp qw/tempdir/; +require PublicInbox::InboxWritable; 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({ mainrepo => $git_dir }); +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)"); +is(0, xsys(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"); @@ -35,28 +33,30 @@ my $rw_commit = sub { $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 { @@ -230,7 +230,7 @@ $ibx->with_umask(sub { $rw_commit->(); $ro->reopen; my $t = $ro->{over_ro}->get_thread('root@s'); - is(scalar(@$t), 4, "got all 4 mesages in thread"); + is(scalar(@$t), 4, "got all 4 messages in thread"); my @exp = sort($long_reply_mid, 'root@s', 'last@s', $long_mid); @res = filter_mids($t); is_deeply(\@res, \@exp, "get_thread works"); @@ -291,14 +291,9 @@ $ibx->with_umask(sub { }); $ibx->with_umask(sub { - my $str = eval { - my $mbox = 't/utf8.mbox'; - open(my $fh, '<', $mbox) or die "failed to open mbox: $mbox\n"; - local $/; - <$fh> - }; - $str =~ s/\AFrom [^\n]+\n//s; - my $mime = Email::MIME->new($str); + my $eml = 't/utf8.eml'; + my $mime = PublicInbox::InboxWritable::mime_from_path($eml) or + die "open $eml: $!"; my $doc_id = $rw->add_message($mime); ok($doc_id > 0, 'message indexed doc_id with UTF-8'); my $msg = $rw->query('m:testmessage@example.com', {limit => 1})->[0]; @@ -320,14 +315,14 @@ $ibx->with_umask(sub { my $mset = $ro->query('t:list@example.com', {mset => 1}); is($mset->size, 6, 'searched To: successfully'); foreach my $m ($mset->items) { - my $smsg = $ro->lookup_article($m->get_docid); + my $smsg = $ro->{over_ro}->get_art($m->get_docid); like($smsg->to, qr/\blist\@example\.com\b/, 'to appears'); } $mset = $ro->query('tc:list@example.com', {mset => 1}); is($mset->size, 6, 'searched To+Cc: successfully'); foreach my $m ($mset->items) { - my $smsg = $ro->lookup_article($m->get_docid); + my $smsg = $ro->{over_ro}->get_art($m->get_docid); my $tocc = join("\n", $smsg->to, $smsg->cc); like($tocc, qr/\blist\@example\.com\b/, 'tocc appears'); } @@ -336,7 +331,7 @@ $ibx->with_umask(sub { my $mset = $ro->query($pfx . 'foo@example.com', { mset => 1 }); is($mset->items, 1, "searched $pfx successfully for Cc:"); foreach my $m ($mset->items) { - my $smsg = $ro->lookup_article($m->get_docid); + my $smsg = $ro->{over_ro}->get_art($m->get_docid); like($smsg->cc, qr/\bfoo\@example\.com\b/, 'cc appears'); } @@ -433,15 +428,19 @@ $ibx->with_umask(sub { } $rw->unindex_blob($amsg); $rw->commit_txn_lazy; - is($ro->lookup_article($art->{num}), undef, 'gone from OVER DB') if defined($art); + SKIP: { + skip('$art not defined', 1) unless defined $art; + is($ro->{over_ro}->get_art($art->{num}), undef, + 'gone from OVER DB'); + }; }); 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) { +# FreeBSD and apparently OpenBSD 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 =~ /(?:free|open)bsd/i) { $all_mask = 0777; $dir_mask = 0770; } @@ -452,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"); }