X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=xt%2Fimapd-mbsync-oimap.t;h=0baf5b4cc073d0421c9f030eb5b4be7f245311c4;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=fdaa22aa9efb868b1b4da4206cc4ef525f81da37;hpb=d67fff9abf168c7517311bdd8987ce174a60f2c4;p=public-inbox.git

diff --git a/xt/imapd-mbsync-oimap.t b/xt/imapd-mbsync-oimap.t
index fdaa22aa..0baf5b4c 100644
--- a/xt/imapd-mbsync-oimap.t
+++ b/xt/imapd-mbsync-oimap.t
@@ -1,12 +1,13 @@
 #!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>
 # ensure mbsync and offlineimap compatibility
 use strict;
-use Test::More;
+use v5.10.1;
 use File::Path qw(mkpath);
 use PublicInbox::TestCommon;
 use PublicInbox::Spawn qw(which spawn);
+require_mods(qw(-imapd));
 my $inboxdir = $ENV{GIANT_INBOX_DIR};
 (defined($inboxdir) && -d $inboxdir) or
 	plan skip_all => "GIANT_INBOX_DIR not defined for $0";
@@ -34,6 +35,8 @@ my $td = start_script($cmd, $env, { 3 => $sock }) or BAIL_OUT "-imapd: $?";
 	my $c = tcp_connect($sock);
 	like(readline($c), qr/CAPABILITY /, 'got greeting');
 }
+
+my $host_port = tcp_host_port($sock);
 my ($host, $port) = ($sock->sockhost, $sock->sockport);
 my %pids;
 
@@ -98,7 +101,7 @@ UseNamespace no
 # DisableExtension COMPRESS=DEFLATE
 
 Channel "test"
-Master ":remote:inbox"
+Master ":remote:INBOX"
 Slave ":local:test"
 Expunge None
 Sync PullNew
@@ -116,8 +119,10 @@ while (scalar keys %pids) {
 	is($?, 0, join(' ', @$cmd, 'done'));
 }
 
-if (my $sec = $ENV{TEST_PERSIST}) {
-	diag "sleeping ${sec}s, imap://$host:$port/$mailbox available";
+my $sec = $ENV{TEST_PERSIST} // 0;
+diag "TEST_PERSIST=$sec";
+if ($sec) {
+	diag "sleeping ${sec}s, imap://$host_port/$mailbox available";
 	diag "tmpdir=$tmpdir (Maildirs available)";
 	diag "stdout=$out";
 	diag "stderr=$err";