#!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;
+use PublicInbox::SHA;
# t/nntpd-v2.t wraps this for v2
my $version = $ENV{PI_TEST_VERSION} || 1;
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:
'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');
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);
}
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 {
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 $!;