No ext_urls

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

diff --git a/xt/imapd-validate.t b/xt/imapd-validate.t
index 9a56c2d04c8fefc62aeead2f52da0bc1e6a1b193..5d665fa96713bde267c4eda78cd5ed149d3695ce 100644 (file)
--- a/xt/imapd-validate.t
+++ b/xt/imapd-validate.t
@@ -1,11 +1,12 @@
 #!perl -w
-# Copyright (C) 2020 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>
 # Expensive test to validate compression and TLS.
 use strict;
-use Test::More;
+use v5.10.1;
 use Symbol qw(gensym);
 use PublicInbox::DS qw(now);
+use PublicInbox::SHA;
 use POSIX qw(_exit);
 use PublicInbox::TestCommon;
 my $inbox_dir = $ENV{GIANT_INBOX_DIR};
@@ -15,7 +16,7 @@ my $BATCH = $ENV{TEST_BATCH} // 100;
 my $REPEAT = $ENV{TEST_REPEAT} // 1;
 diag "TEST_BATCH=$BATCH TEST_REPEAT=$REPEAT";
 
-require_mods(qw(Mail::IMAPClient));
+require_mods(qw(Mail::IMAPClient -imapd));
 my $imap_client = 'Mail::IMAPClient';
 my $can_compress = $imap_client->can('compress');
 if ($can_compress) { # hope this gets fixed upstream, soon
@@ -64,7 +65,7 @@ my $do_get_all = sub {
        my ($desc, $opt) = @_;
        local $SIG{__DIE__} = sub { print STDERR $desc, ': ', @_; _exit(1) };
        my $t0 = now();
-       my $dig = Digest::SHA->new(1);
+       my $dig = PublicInbox::SHA->new(1);
        my $mic = $imap_client->new(%$opt);
        $mic->examine($mailbox) or die "examine: $!";
        my $uid_base = 1;
@@ -152,11 +153,11 @@ $make_local_server = sub {
        # not using multiple workers, here, since we want to increase
        # the chance of tripping concurrency bugs within PublicInbox/IMAP*.pm
        my $cmd = [ '-imapd', "--stdout=$out", "--stderr=$err", '-W0' ];
-       push @$cmd, '-limap://'.$imap->sockhost.':'.$imap->sockport;
+       push @$cmd, '-limap://'.tcp_host_port($imap);
        if ($test_tls) {
                my $imaps = tcp_server();
                $rdr->{4} = $imaps;
-               push @$cmd, '-limaps://'.$imaps->sockhost.':'.$imaps->sockport;
+               push @$cmd, '-limaps://'.tcp_host_port($imaps);
                push @$cmd, "--cert=$cert", "--key=$key";
                my $tls_opt = [
                        SSL_hostname => 'server.local',