X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=xt%2Fnntpd-validate.t;h=83f024f984ebdf9f56d45c433fd919201ba9ead7;hb=0b15dfc58ceaecdcb1c9285c3ad55813006c8338;hp=39108639ab9edfe793c5b9de7d7546c926544299;hpb=28caef46cadc34c53e33994597de28f8e05552c0;p=public-inbox.git
diff --git a/xt/nntpd-validate.t b/xt/nntpd-validate.t
index 39108639..83f024f9 100644
--- a/xt/nntpd-validate.t
+++ b/xt/nntpd-validate.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2021 all contributors
# License: AGPL-3.0+
# Integration test to validate compression.
@@ -8,16 +8,13 @@ use Test::More;
use Symbol qw(gensym);
use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
use POSIX qw(_exit);
+use PublicInbox::TestCommon;
my $inbox_dir = $ENV{GIANT_INBOX_DIR};
plan skip_all => "GIANT_INBOX_DIR not defined for $0" unless $inbox_dir;
my $mid = $ENV{TEST_MID};
# Net::NNTP is part of the standard library, but distros may split it off...
-foreach my $mod (qw(DBD::SQLite Net::NNTP Compress::Raw::Zlib)) {
- eval "require $mod";
- plan skip_all => "$mod missing for $0" if $@;
-}
-
+require_mods(qw(DBD::SQLite Net::NNTP Compress::Raw::Zlib));
my $test_compress = Net::NNTP->can('compress');
if (!$test_compress) {
diag 'Your Net::NNTP does not yet support compression';
@@ -29,7 +26,6 @@ my $key = 'certs/server-key.pem';
if ($test_tls && !-r $key || !-r $cert) {
plan skip_all => "certs/ missing for $0, run $^X ./certs/create-certs.perl";
}
-require './t/common.perl';
my ($tmpdir, $ftd) = tmpdir();
$File::Temp::KEEP_ALL = !!$ENV{TEST_KEEP_TMP};
my (%OPT, $td, $host_port, $group);
@@ -173,8 +169,7 @@ sub make_local_server {
open my $fh, '>', $_ or die "truncate: $!";
}
my $sock = tcp_server();
- ok($sock, 'sock created');
- $host_port = $sock->sockhost . ':' . $sock->sockport;
+ $host_port = tcp_host_port($sock);
# not using multiple workers, here, since we want to increase
# the chance of tripping concurrency bugs within PublicInbox/NNTP*.pm