-# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
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 PublicInbox::Eml;
use IO::Socket;
use Socket qw(IPPROTO_TCP TCP_NODELAY);
use Net::NNTP;
use Sys::Hostname;
-require './t/common.perl';
# FIXME: make easier to test both versions
my $version = $ENV{PI_TEST_VERSION} || 2;
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;
# ensure successful message delivery
{
- my $mime = Email::MIME->new(<<EOF);
+ my $mime = PublicInbox::Eml->new(<<EOF);
To: =?utf-8?Q?El=C3=A9anor?= <you\@example.com>
From: =?utf-8?Q?El=C3=A9anor?= <me\@example.com>
Cc: $addr
$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');
}
}
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(<<EOF, 2);
+IO::Socket::SSL <2.007 not supported by Net::NNTP
+EOF
ok(!$n->starttls, 'STARTTLS fails when unconfigured');
is($n->code, 580, 'got 580 code on server w/o TLS');
};
ok($date <= $t1, 'valid date before stop');
}
if ('leafnode interop') {
- my $for_leafnode = PublicInbox::MIME->new(<<"");
+ my $for_leafnode = PublicInbox::Eml->new(<<"");
From: longheader\@example.com
To: $addr
Subject: none
$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/;
$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');
is($? >> 8, 0, 'no errors');
}
SKIP: {
- my @of = `lsof -p $td->{pid} 2>/dev/null`;
+ if ($INC{'Search/Xapian.pm'} && ($ENV{TEST_RUN_MODE}//2)) {
+ skip 'Search/Xapian.pm pre-loaded (by t/run.perl?)', 1;
+ }
+ 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');
$n = $s = undef;
$td->join;
- my $eout = eval {
- local $/;
+ is($?, 0, 'no error in exited process');
+ my $eout = do {
open my $fh, '<', $err or die "open $err failed: $!";
+ local $/;
<$fh>;
};
- is($?, 0, 'no error in exited process');
unlike($eout, qr/wide/i, 'no Wide character warnings');
}