No ext_urls

[public-inbox.git] / xt / nntpd-validate.t

diff --git a/xt/nntpd-validate.t b/xt/nntpd-validate.t
index c82d46e27ef156a1499aaadee3ef406655e83dcb..a6f3980eca861356367ffc60d3aeeecf967cc879 100644 (file)
--- a/xt/nntpd-validate.t
+++ b/xt/nntpd-validate.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Integration test to validate compression.
@@ -8,16 +8,14 @@ use Test::More;
 use Symbol qw(gensym);
 use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
 use POSIX qw(_exit);
+use PublicInbox::TestCommon;
+use PublicInbox::SHA;
 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 +27,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";
 }
-use PublicInbox::TestCommon;
 my ($tmpdir, $ftd) = tmpdir();
 $File::Temp::KEEP_ALL = !!$ENV{TEST_KEEP_TMP};
 my (%OPT, $td, $host_port, $group);
@@ -59,7 +56,7 @@ sub do_get_all {
        my ($methods) = @_;
        my $desc = join(',', @$methods);
        my $t0 = clock_gettime(CLOCK_MONOTONIC);
-       my $dig = Digest::SHA->new(1);
+       my $dig = PublicInbox::SHA->new(1);
        my $digfh = gensym;
        my $tmpfh;
        if ($File::Temp::KEEP_ALL) {
@@ -173,8 +170,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