nntp: inline CRLF in all response lines

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

diff --git a/t/nntpd.t b/t/nntpd.t
index 7db371ddb661306034b91b9ece026f466607f9cc..34e9e1b45462675d175f807fc6a1bdc38477334f 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,10 +1,7 @@
 #!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);
+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');
@@ -365,8 +358,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 +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;