git: use --batch-command in git 2.36+ to save processes

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

diff --git a/t/nntpd.t b/t/nntpd.t
index d352c3c14805aa523cd15518f1a4789c97416933..bebf4203c18367f94cd65634d6ae4e05bbe288ac 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -93,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:
@@ -120,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');
 
@@ -351,23 +358,23 @@ 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;
                ($^O =~ /\A(?:linux)\z/) or
                        skip "lsof /(deleted)/ check untested on $^O", 1;
                my @lsof = xqx([$lsof, '-p', $td->{pid}], undef, $noerr);
-               my $d = [ grep(/\(deleted\)/, @lsof) ];
+               my $d = [ grep(/\(deleted\)/, grep(!/batch-command\.err/, @lsof)) ];
                is_deeply($d, [], 'no deleted files') or diag explain($d);
        };
        SKIP: { test_watch($tmpdir, $host_port, $group) };
        {
                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 {