X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=d352c3c14805aa523cd15518f1a4789c97416933;hb=e28f33dc1b6e6a296946c0c58b43900c6cbd07f7;hp=7db371ddb661306034b91b9ece026f466607f9cc;hpb=210d283ed36eff9bb81ec1e644a02dd4f0d39e31;p=public-inbox.git
diff --git a/t/nntpd.t b/t/nntpd.t
index 7db371dd..d352c3c1 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,14 +1,10 @@
#!perl -w
-# Copyright (C) 2015-2021 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
-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 };
@@ -253,10 +249,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');
@@ -365,8 +357,9 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
$lsof or skip 'lsof missing', 1;
($^O =~ /\A(?:linux)\z/) or
skip "lsof /(deleted)/ check untested on $^O", 1;
- my @of = xqx([$lsof, '-p', $td->{pid}], undef, $noerr);
- is(scalar(grep(/\(deleted\)/, @of)), 0, 'no deleted files');
+ my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $noerr);
+ my $d = [ grep(/\(deleted\)/, @lsof) ];
+ is_deeply($d, [], 'no deleted files') or diag explain($d);
};
SKIP: { test_watch($tmpdir, $host_port, $group) };
{
@@ -445,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;