X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=2d7280a50d5e8a466c9a36649a916c8603aa293a;hb=47f8836273133fb4a13e895feff7f7ee34ae7109;hp=c3712b67ea337c690f9f6db14ae95463dc97cf37;hpb=7321c78ebdcaa7ce5f0f8383e07429827da0b718;p=public-inbox.git
diff --git a/t/nntpd.t b/t/nntpd.t
index c3712b67..2d7280a5 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,21 +1,17 @@
-# Copyright (C) 2015-2019 all contributors
+# Copyright (C) 2015-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-foreach my $mod (qw(DBD::SQLite)) {
- eval "require $mod";
- plan skip_all => "$mod missing for nntpd.t" if $@;
-}
-require PublicInbox::SearchIdx;
-require PublicInbox::Msgmap;
+use PublicInbox::TestCommon;
+use PublicInbox::Spawn qw(which);
+require_mods(qw(DBD::SQLite));
require PublicInbox::InboxWritable;
use Email::Simple;
use IO::Socket;
use Socket qw(IPPROTO_TCP TCP_NODELAY);
use Net::NNTP;
use Sys::Hostname;
-use PublicInbox::TestCommon;
# FIXME: make easier to test both versions
my $version = $ENV{PI_TEST_VERSION} || 2;
@@ -51,7 +47,7 @@ $ibx = PublicInbox::Inbox->new($ibx);
my @cmd = ('-init', $group, $inboxdir, 'http://example.com/', $addr);
push @cmd, "-V$version", '-Lbasic';
ok(run_script(\@cmd), 'init OK');
- is(system(qw(git config), "--file=$home/.public-inbox/config",
+ is(xsys(qw(git config), "--file=$home/.public-inbox/config",
"publicinbox.$group.newsgroup", $group),
0, 'enabled newsgroup');
my $len;
@@ -81,8 +77,8 @@ EOF
$im->add($mime);
$im->done;
if ($version == 1) {
- my $s = PublicInbox::SearchIdx->new($ibx, 1);
- $s->index_sync;
+ ok(run_script(['-index', $ibx->{inboxdir}]),
+ 'indexed v1');
}
}
@@ -106,10 +102,12 @@ EOF
SKIP: {
$n->can('starttls') or
skip('Net::NNTP too old to support STARTTLS', 2);
+ require_mods('IO::Socket::SSL', 2);
eval {
- require IO::Socket::SSL;
IO::Socket::SSL->VERSION(2.007);
- } or skip('IO::Socket::SSL <2.007 not supported by Net::NNTP');
+ } or skip(<starttls, 'STARTTLS fails when unconfigured');
is($n->code, 580, 'got 580 code on server w/o TLS');
};
@@ -254,8 +252,8 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
$im->add($for_leafnode);
$im->done;
if ($version == 1) {
- my $s = PublicInbox::SearchIdx->new($ibx, 1);
- $s->index_sync;
+ 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/;
@@ -269,7 +267,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
$for_leafnode->header_set('Message-ID', @mids);
$for_leafnode->body_set('not-a-dupe');
my $warn = '';
- $SIG{__WARN__} = sub { $warn .= join('', @_) };
+ local $SIG{__WARN__} = sub { $warn .= join('', @_) };
$im->add($for_leafnode);
$im->done;
like($warn, qr/reused/, 'warned for reused MID');
@@ -302,10 +300,12 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
is($? >> 8, 0, 'no errors');
}
SKIP: {
- if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//1)) {
+ if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//2)) {
skip 'Search/Xapian.pm pre-loaded (by t/run.perl?)', 1;
}
- my @of = `lsof -p $td->{pid} 2>/dev/null`;
+ my $lsof = which('lsof') or skip 'lsof missing', 1;
+ my $rdr = { 2 => \(my $null) };
+ my @of = xqx([$lsof, '-p', $td->{pid}], undef, $rdr);
skip('lsof broken', 1) if (!scalar(@of) || $?);
my @xap = grep m!Search/Xapian!, @of;
is_deeply(\@xap, [], 'Xapian not loaded in nntpd');