X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fnntpd.t;h=890850491fac47cf637ea49ee49a61a8b02b9287;hb=d7fda3f4b9d4c9e6d01c818f09905d6827fa693f;hp=c3712b67ea337c690f9f6db14ae95463dc97cf37;hpb=7321c78ebdcaa7ce5f0f8383e07429827da0b718;p=public-inbox.git

diff --git a/t/nntpd.t b/t/nntpd.t
index c3712b67..89085049 100644
--- 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');
 	};