From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id BD0FB1F5AF for ; Sat, 20 Jun 2020 00:13:02 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] testcommon: require IO::Socket::SSL >= 2.007 Date: Sat, 20 Jun 2020 00:13:01 +0000 Message-Id: <20200620001302.1150-2-e@yhbt.net> In-Reply-To: <20200620001302.1150-1-e@yhbt.net> References: <20200620001302.1150-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Net::NNTP does not support older IO::Socket::SSL. 1.94 on CentOS 7.x fails HTTPS and IMAPS tests, too. cf. https://rt.cpan.org/Ticket/Display.html?id=100529 --- lib/PublicInbox/TestCommon.pm | 10 +++++++++- t/nntpd-tls.t | 2 -- t/nntpd.t | 5 ----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index a97125e5..6bf4526a 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -95,7 +95,15 @@ sub require_mods { } else { eval "require $mod"; } - push @need, $mod if $@; + if ($@) { + push @need, $mod; + } elsif ($mod eq 'IO::Socket::SSL' && + # old versions of IO::Socket::SSL aren't supported + # by libnet, at least: + # https://rt.cpan.org/Ticket/Display.html?id=100529 + !eval{ IO::Socket::SSL->VERSION(2.007); 1 }) { + push @need, $@; + } } return unless @need; my $m = join(', ', @need)." missing for $0"; diff --git a/t/nntpd-tls.t b/t/nntpd-tls.t index 3de219f1..23baf4e4 100644 --- a/t/nntpd-tls.t +++ b/t/nntpd-tls.t @@ -10,8 +10,6 @@ use PublicInbox::TestCommon; require_mods(qw(DBD::SQLite IO::Socket::SSL Net::NNTP IO::Poll)); Net::NNTP->can('starttls') or plan skip_all => 'Net::NNTP does not support TLS'; -IO::Socket::SSL->VERSION(2.007) or - plan skip_all => 'IO::Socket::SSL <2.007 not supported by Net::NNTP'; my $cert = 'certs/server-cert.pem'; my $key = 'certs/server-key.pem'; diff --git a/t/nntpd.t b/t/nntpd.t index b24720eb..575b66fa 100644 --- a/t/nntpd.t +++ b/t/nntpd.t @@ -109,11 +109,6 @@ EOF $n->can('starttls') or skip('Net::NNTP too old to support STARTTLS', 2); require_mods('IO::Socket::SSL', 2); - eval { - IO::Socket::SSL->VERSION(2.007); - } or skip(<starttls, 'STARTTLS fails when unconfigured'); is($n->code, 580, 'got 580 code on server w/o TLS'); };