X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=34e9e1b45462675d175f807fc6a1bdc38477334f;hb=HEAD;hp=7db371ddb661306034b91b9ece026f466607f9cc;hpb=210d283ed36eff9bb81ec1e644a02dd4f0d39e31;p=public-inbox.git

diff --git a/t/nntpd.t b/t/nntpd.t
index 7db371dd..dbbc37b8 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,23 +1,19 @@
 #!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);
-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;
+use PublicInbox::SHA;
 
 # t/nntpd-v2.t wraps this for v2
 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 };
 
@@ -97,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:
@@ -124,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');
 
@@ -253,10 +256,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');
@@ -305,7 +304,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
 			my %sums;
 			for (1..$nart) {
 				<$s> =~ /\A220 / or _exit(4);
-				my $dig = Digest::SHA->new(1);
+				my $dig = PublicInbox::SHA->new(1);
 				while (my $l = <$s>) {
 					last if $l eq ".\r\n";
 					$dig->add($l);
@@ -359,22 +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 @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\)/, 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 {
@@ -413,7 +413,7 @@ sub test_watch {
 	use_ok 'PublicInbox::Watch';
 	use_ok 'PublicInbox::InboxIdle';
 	use_ok 'PublicInbox::Config';
-	require_git('1.8.5', 1) or skip('git 1.8.5+ needed for --urlmatch', 4);
+	require_git('1.8.5', 4);
 	my $old_env = { HOME => $ENV{HOME} };
 	my $home = "$tmpdir/watch_home";
 	mkdir $home or BAIL_OUT $!;
@@ -445,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;