t/feed: remove useless $ENV{GIT_DIR} assignment

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

diff --git a/t/search.t b/t/search.t
index 240139b08f7a205f12ccdf87cba29f68ec803e45..8508f27301443d28d39a57bd54ed86cd0a38300a 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -1,4 +1,4 @@
-# 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;
@@ -7,13 +7,14 @@ use PublicInbox::TestCommon;
 require_mods(qw(DBD::SQLite Search::Xapian));
 require PublicInbox::SearchIdx;
 require PublicInbox::Inbox;
+require PublicInbox::InboxWritable;
 use Email::MIME;
 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)")
+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");
@@ -229,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");
@@ -290,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];