qspawn: drop lineno from command failure warning

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

diff --git a/t/nntpd.t b/t/nntpd.t
index 3c171a3b88b9fac5860ebfbac416eface8a8a0ee..30233ce0c3b186ba8dd4d813183d8d81e874584a 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,11 +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;
-require_mods(qw(DBD::SQLite));
+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;
@@ -94,6 +93,13 @@ close $cfgfh or BAIL_OUT;
        is_deeply([$n->group($group)], [ qw(0 1 1), $group ], 'GROUP works');
        is_deeply($n->listgroup($group), [1], 'listgroup OK');
        # TODO: Net::NNTP::listgroup does not support range at the moment
+       my $s = tcp_connect($sock);
+       sysread($s, my $buf, 4096);
+       is($buf, "201 " . hostname . " ready - post via email\r\n",
+               'got greeting');
+       syswrite($s, "LISTGROUP $group 1-1\r\n");
+       $buf = read_til_dot($s);
+       like($buf, qr/\r\n1\r\n/s, 'LISTGROUP with range works');
 
        {
                my $expect = [ qw(Subject: From: Date: Message-ID:
@@ -121,8 +127,8 @@ close $cfgfh or BAIL_OUT;
                'references' => '<reftabsqueezed>',
        );
 
-       my $s = tcp_connect($sock);
-       sysread($s, my $buf, 4096);
+       $s = tcp_connect($sock);
+       sysread($s, $buf, 4096);
        is($buf, "201 " . hostname . " ready - post via email\r\n",
                'got greeting');
 
@@ -352,7 +358,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
                }
                ok(run_script([qw(-index -c -j0 --reindex), $ibx->{inboxdir}],
                                undef, $noerr), '-compacted');
-               select(undef, undef, undef, $fast_idle ? 0.1 : 2.1);
+               tick($fast_idle ? 0.1 : 2.1);
                $art = $n->article($ex->header('Message-ID'));
                ok($art, 'new article retrieved after compact');
                $lsof or skip 'lsof missing', 1;
@@ -366,9 +372,9 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
        {
                setsockopt($s, IPPROTO_TCP, TCP_NODELAY, 1);
                syswrite($s, 'HDR List-id 1-');
-               select(undef, undef, undef, 0.15);
+               tick(0.15);
                ok($td->kill, 'killed nntpd');
-               select(undef, undef, undef, 0.15);
+               tick(0.15);
                syswrite($s, "\r\n");
                $buf = '';
                do {
@@ -439,7 +445,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;