treewide: run update-copyrights from gnulib for 2019

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

diff --git a/t/nntpd.t b/t/nntpd.t
index 30f3fb9c761863b20760b0557c590b87e1ea480a..890850491fac47cf637ea49ee49a61a8b02b9287 100644 (file)
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -1,12 +1,10 @@
-# 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 $@;
-}
+use PublicInbox::TestCommon;
+require_mods(qw(DBD::SQLite));
 require PublicInbox::SearchIdx;
 require PublicInbox::Msgmap;
 require PublicInbox::InboxWritable;
@@ -15,7 +13,6 @@ 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;
@@ -106,10 +103,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(<<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');
        };
@@ -302,6 +301,9 @@ 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)) {
+                       skip 'Search/Xapian.pm pre-loaded (by t/run.perl?)', 1;
+               }
                my @of = `lsof -p $td->{pid} 2>/dev/null`;
                skip('lsof broken', 1) if (!scalar(@of) || $?);
                my @xap = grep m!Search/Xapian!, @of;