inboxwritable: mime_from_path: reuse in more places

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

diff --git a/t/search.t b/t/search.t
index 586841383c479478d6974564b899116aaa9a40de..101d44e9cb769584b07ebe30588d2b734ce7c557 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -1,16 +1,13 @@
-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 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;
 require PublicInbox::Inbox;
-require './t/common.perl';
+require PublicInbox::InboxWritable;
 use Email::MIME;
 my ($tmpdir, $for_destroy) = tmpdir();
 my $git_dir = "$tmpdir/a.git";
@@ -233,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");
@@ -294,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];
@@ -323,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');
        }
@@ -339,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');
                }
@@ -436,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;
 }