imap+nntp: share COMPRESS implementation

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

diff --git a/xt/imapd-validate.t b/xt/imapd-validate.t
index aeeb43b9b40f2de330286349830929a8154d30e2..5d27d2a0655eefddb914522a62453311a9c1c467 100644 (file)
--- a/xt/imapd-validate.t
+++ b/xt/imapd-validate.t
@@ -1,9 +1,9 @@
 #!perl -w
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 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 POSIX qw(_exit);
@@ -13,8 +13,9 @@ plan skip_all => "GIANT_INBOX_DIR not defined for $0" unless $inbox_dir;
 # how many emails to read into memory at once per-process
 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
@@ -151,11 +152,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',