X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=d352c3c14805aa523cd15518f1a4789c97416933;hb=6da44a6151dfb59147d8a114548de1951909f9d1;hp=67205fe5e27006d1d6460ea18b13a8d9590a81bf;hpb=08b14e417843557ec6a42fd9e5f0cedbd81832e8;p=public-inbox.git

diff --git a/t/nntpd.t b/t/nntpd.t
index 67205fe5..d352c3c1 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,14 +1,10 @@
 #!perl -w
-# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-use strict;
-use v5.10.1;
-use PublicInbox::TestCommon;
-use PublicInbox::Spawn qw(which);
-require_mods(qw(DBD::SQLite));
+use strict; use v5.10.1; use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite Net::NNTP));
 use PublicInbox::Eml;
 use Socket qw(IPPROTO_TCP TCP_NODELAY);
-use Net::NNTP;
 use Sys::Hostname;
 use POSIX qw(_exit);
 use Digest::SHA;
@@ -17,7 +13,7 @@ use Digest::SHA;
 my $version = $ENV{PI_TEST_VERSION} || 1;
 require_git('2.6') if $version == 2;
 use_ok 'PublicInbox::Msgmap';
-my $lsof = which('lsof');
+my $lsof = require_cmd('lsof', 1);
 my $fast_idle = eval { require Linux::Inotify2; 1 } //
 		eval { require IO::KQueue; 1 };
 
@@ -442,7 +438,7 @@ sub test_watch {
 	my $w = start_script(['-watch'], undef, { 2 => $err_wr });
 
 	diag 'waiting for initial fetch...';
-	PublicInbox::DS->EventLoop;
+	PublicInbox::DS::event_loop();
 	diag 'inbox unlocked on initial fetch';
 	$w->kill;
 	$w->join;