From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 4CBD31F560 for ; Tue, 12 Sep 2023 12:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1694521525; bh=ZpsRz/FsIjU0IRVEbvvAu6fGzPLQdB7f97ehCkNR3lU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=gTb+QW/96oUgGpJwFmt8B/KNrxaKgbHIYCWPRxzstmFVrUCHO2IZq34onaLviblKU Ei0e6MZMZHDWA73DPFUIyQ2P1s381rzFkb0BYxVAX9qVW9Uw+HJlgz8T7Y0j95nI6m ENusxR+NEXJqNvOj+swMhk5hHXtjC/d8ISc2E+/U= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] tests: favor IO::Socket::IP for IPv6 listeners Date: Tue, 12 Sep 2023 12:25:23 +0000 Message-ID: <20230912122525.1776117-2-e@80x24.org> In-Reply-To: <20230912122525.1776117-1-e@80x24.org> References: <20230912122525.1776117-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: IO::Socket::IP is bundled with Perl 5.24+ so it's more likely to be available than IO::Socket::INET6. --- lib/PublicInbox/TestCommon.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index 17057e18..b1a37ced 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -62,8 +62,12 @@ sub tcp_server () { ); eval { die 'IPv4-only' if $ENV{TEST_IPV4_ONLY}; - require IO::Socket::INET6; - IO::Socket::INET6->new(%opt, LocalAddr => '[::1]') + my $pkg; + for (qw(IO::Socket::IP IO::Socket::INET6)) { + eval "require $_" or next; + $pkg = $_ and last; + } + $pkg->new(%opt, LocalAddr => '[::1]'); } || eval { die 'IPv6-only' if $ENV{TEST_IPV6_ONLY}; IO::Socket::INET->new(%opt, LocalAddr => '127.0.0.1')