X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=xt%2Fimapd-mbsync-oimap.t;h=6635e2b477ee80381dd64118f5bb5bd1f4f5757b;hb=fc69b9b91323c62e8abeaa8723f4d3fffdac0e27;hp=edf111fde3eca3a859abae89d206e7ed174b6025;hpb=4042599799a3706d1b1c0589675b07cab610505a;p=public-inbox.git diff --git a/xt/imapd-mbsync-oimap.t b/xt/imapd-mbsync-oimap.t index edf111fd..6635e2b4 100644 --- a/xt/imapd-mbsync-oimap.t +++ b/xt/imapd-mbsync-oimap.t @@ -1,5 +1,5 @@ #!perl -w -# Copyright (C) 2020 all contributors +# Copyright (C) 2020-2021 all contributors # License: AGPL-3.0+ # ensure mbsync and offlineimap compatibility use strict; @@ -35,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; @@ -99,7 +101,7 @@ UseNamespace no # DisableExtension COMPRESS=DEFLATE Channel "test" -Master ":remote:inbox" +Master ":remote:INBOX" Slave ":local:test" Expunge None Sync PullNew @@ -120,7 +122,7 @@ while (scalar keys %pids) { my $sec = $ENV{TEST_PERSIST} // 0; diag "TEST_PERSIST=$sec"; if ($sec) { - diag "sleeping ${sec}s, imap://$host:$port/$mailbox available"; + diag "sleeping ${sec}s, imap://$host_port/$mailbox available"; diag "tmpdir=$tmpdir (Maildirs available)"; diag "stdout=$out"; diag "stderr=$err";