From a09f678d8254064af7ca6dcfb3c3f84b5ae37b51 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 22 Dec 2019 22:17:37 +0000 Subject: testcommon: add require_mods method and use it This cuts down on lines of code in individual test cases and fixes some misnamed error messages by using "$0" consistently. This will also provide us with a method of swapping out dependencies which provide equivalent functionality (e.g "Xapian" SWIG can replace "Search::Xapian" XS bindings). --- t/nntpd.t | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 't/nntpd.t') diff --git a/t/nntpd.t b/t/nntpd.t index c3712b67..243b8e56 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -3,10 +3,8 @@ 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(<starttls, 'STARTTLS fails when unconfigured'); is($n->code, 580, 'got 580 code on server w/o TLS'); }; -- cgit v1.2.3-24-ge0c7