X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=cf1c44f80b23d83ed6f4521aebdf04e18aa5a036;hb=7e4bd71efcf3bf61216ec1a7577e33be5f95b8a9;hp=ce4d7cf9bf00a93415326ae07f7000001574b14b;hpb=4c6c853494b4936825741bb5e8885f1312639058;p=public-inbox.git
diff --git a/t/nntpd.t b/t/nntpd.t
index ce4d7cf9..cf1c44f8 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,10 +1,7 @@
#!perl -w
# Copyright (C) 2015-2021 all contributors
# License: AGPL-3.0+
-use strict;
-use v5.10.1;
-use PublicInbox::TestCommon;
-use PublicInbox::Spawn qw(which);
+use strict; use v5.10.1; use PublicInbox::TestCommon;
require_mods(qw(DBD::SQLite));
use PublicInbox::Eml;
use Socket qw(IPPROTO_TCP TCP_NODELAY);
@@ -17,7 +14,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 };
@@ -253,10 +250,6 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
my $im = $ibx->importer(0);
$im->add($for_leafnode);
$im->done;
- if ($version == 1) {
- ok(run_script(['-index', $ibx->{inboxdir}]),
- 'indexed v1');
- }
my $hdr = $n->head("<$long_hdr>");
my $expect = qr/\AMessage-ID: /i . qr/\Q<$long_hdr>\E/;
ok(scalar(grep(/$expect/, @$hdr)), 'Message-ID not folded');
@@ -446,7 +439,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;