drop needless `eval {}' around Config->new

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

diff --git a/t/v2mda.t b/t/v2mda.t
index 0cd852b1908b97240e00bddf1a8ff84384997769..e9dcdf44df8eb307506cefddb729f209ce378cd6 100644 (file)
--- a/t/v2mda.t
+++ b/t/v2mda.t
@@ -1,22 +1,18 @@
-# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-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;
 use PublicInbox::MIME;
-use File::Temp qw/tempdir/;
 use Fcntl qw(SEEK_SET);
 use Cwd;
-require './t/common.perl';
+use PublicInbox::TestCommon;
 require_git(2.6);
 
 my $V = 2;
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for v2mda.t" if $@;
-}
+require_mods(qw(DBD::SQLite Search::Xapian));
 use_ok 'PublicInbox::V2Writable';
-my $tmpdir = tempdir('pi-v2mda-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $ibx = {
        inboxdir => "$tmpdir/inbox",
        name => 'test-v2writable',
@@ -76,7 +72,7 @@ is($saved->{mime}->as_string, $mime->as_string, 'injected message');
        my $config = "$ENV{PI_DIR}/config";
        ok(-f $config, 'config exists');
        my $k = 'publicinboxmda.spamcheck';
-       is(system('git', 'config', "--file=$config", $k, 'none'), 0,
+       is(xsys('git', 'config', "--file=$config", $k, 'none'), 0,
                'disabled spamcheck for mda');
 
        ok(run_script(['-mda'], undef, $rdr), 'mda did not die');