testcommon: add require_mods method and use it

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

diff --git a/t/v2writable.t b/t/v2writable.t
index 28420bb92419a4259707cae1cf4a67d8bf292aa9..63f27f962b896dd89653376f17e463b37311b312 100644 (file)
--- a/t/v2writable.t
+++ b/t/v2writable.t
@@ -5,16 +5,14 @@ use warnings;
 use Test::More;
 use PublicInbox::MIME;
 use PublicInbox::ContentId qw(content_digest);
-use File::Temp qw/tempdir/;
-require './t/common.perl';
+use PublicInbox::TestCommon;
+use Cwd qw(abs_path);
 require_git(2.6);
-foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for nntpd.t" if $@;
-}
+require_mods(qw(DBD::SQLite Search::Xapian));
+local $ENV{HOME} = abs_path('t');
 use_ok 'PublicInbox::V2Writable';
 umask 007;
-my $inboxdir = tempdir('pi-v2writable-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
        inboxdir => $inboxdir,
        name => 'test-v2writable',
@@ -163,12 +161,10 @@ EOF
        close $fh or die "close: $!\n";
        my $sock = tcp_server();
        ok($sock, 'sock created');
-       my $pid;
        my $len;
-       END { kill 'TERM', $pid if defined $pid };
-       my $nntpd = 'blib/script/public-inbox-nntpd';
-       my $cmd = [ $nntpd, '-W0', "--stdout=$out", "--stderr=$err" ];
-       $pid = spawn_listener({ PI_CONFIG => $pi_config }, $cmd, [ $sock ]);
+       my $cmd = [ '-nntpd', '-W0', "--stdout=$out", "--stderr=$err" ];
+       my $env = { PI_CONFIG => $pi_config };
+       my $td = start_script($cmd, $env, { 3 => $sock });
        my $host_port = $sock->sockhost . ':' . $sock->sockport;
        my $n = Net::NNTP->new($host_port);
        $n->group($group);