No ext_urls

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

diff --git a/t/imapd.t b/t/imapd.t
index 8cdb4e4aa12e85f04ff9268f6e8cee0eec0c00d5..c7dc01a57ea3975c6ae8dca7f99fe01d865f0567 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -1,13 +1,12 @@
 #!perl -w
-# Copyright (C) 2020-2021 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>
 # end-to-end IMAP tests, see unit tests in t/imap.t, too
 use strict;
-use Test::More;
+use v5.10.1;
 use Time::HiRes ();
 use PublicInbox::TestCommon;
 use PublicInbox::Config;
-use PublicInbox::Spawn qw(which);
 require_mods(qw(-imapd Mail::IMAPClient));
 my $imap_client = 'Mail::IMAPClient';
 my $can_compress = $imap_client->can('compress');
@@ -39,7 +38,8 @@ print $cfgfh <<EOM or BAIL_OUT;
 EOM
 my $eml;
 for my $V (@V) {
-       my $ibx = create_inbox("i$V", tmpdir => "$tmpdir/i$V", version => $V,
+       my $ibx = create_inbox("i$V-$level",
+                               tmpdir => "$tmpdir/i$V", version => $V,
                                indexlevel => $level, sub {
                my ($im) = @_;
                $im->add($eml //= eml_load('t/utf8.eml')) or BAIL_OUT;
@@ -52,6 +52,7 @@ for my $V (@V) {
        address = $ibx->{-primary_address};
        newsgroup = inbox.i$V
        url = http://example.com/i$V
+       indexlevel = $level
 EOF
 }
 close $cfgfh or BAIL_OUT;
@@ -98,7 +99,8 @@ ok($mic->examine($mailbox1), 'EXAMINE succeeds');
 my @raw = $mic->status($mailbox1, qw(Messages uidnext uidvalidity));
 is(scalar(@raw), 2, 'got status response');
 like($raw[0], qr/\A\*\x20STATUS\x20inbox\.i1\.$first_range\x20
-       \(MESSAGES\x20\d+\x20UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx);
+       \(MESSAGES\x20[1-9][0-9]*\x20
+       UIDNEXT\x20\d+\x20UIDVALIDITY\x20\d+\)\r\n/sx);
 like($raw[1], qr/\A\S+ OK /, 'finished status response');
 
 my @orig_list = @raw = $mic->list;
@@ -436,15 +438,14 @@ ok($mic->logout, 'logged out');
 
 SKIP: {
        use_ok 'PublicInbox::InboxIdle';
-       require_git('1.8.5', 1) or
-               skip('git 1.8.5+ needed for --urlmatch', 4);
+       require_git '1.8.5', 4;
        my $old_env = { HOME => $ENV{HOME} };
        my $home = "$tmpdir/watch_home";
        mkdir $home or BAIL_OUT $!;
        mkdir "$home/.public-inbox" or BAIL_OUT $!;
        local $ENV{HOME} = $home;
        my $name = 'watchimap';
-       my $addr = "i1\@example.com";
+       my $addr = "i1-$level\@example.com";
        my $url = "http://example.com/i1";
        my $inboxdir = "$tmpdir/watchimap";
        my $cmd = ['-init', '-V2', '-Lbasic', $name, $inboxdir, $url, $addr];
@@ -465,17 +466,18 @@ SKIP: {
        my $w = start_script(['-watch'], undef, { 2 => $err_wr });
 
        diag 'waiting for initial fetch...';
-       PublicInbox::DS->EventLoop;
+       PublicInbox::DS::event_loop();
        diag 'inbox unlocked on initial fetch, waiting for IDLE';
 
-       tick until (grep(/I: \S+ idling/, <$err>));
+       tick until (grep(/# \S+ idling/, <$err>));
        open my $fh, '<', 't/iso-2202-jp.eml' or BAIL_OUT $!;
        $old_env->{ORIGINAL_RECIPIENT} = $addr;
        ok(run_script([qw(-mda --no-precheck)], $old_env, { 0 => $fh }),
-               'delivered a message for IDLE to kick -watch');
+               'delivered a message for IDLE to kick -watch') or
+               diag "mda error \$?=$?";
        diag 'waiting for IMAP IDLE wakeup';
        PublicInbox::DS->SetPostLoopCallback(undef);
-       PublicInbox::DS->EventLoop;
+       PublicInbox::DS::event_loop();
        diag 'inbox unlocked on IDLE wakeup';
 
        # try again with polling
@@ -484,7 +486,7 @@ SKIP: {
                or BAIL_OUT "git config $?";
        $w->kill('HUP');
        diag 'waiting for -watch reload + initial fetch';
-       tick until (grep(/I: will check/, <$err>));
+       tick until (grep(/# will check/, <$err>));
 
        open $fh, '<', 't/psgi_attach.eml' or BAIL_OUT $!;
        ok(run_script([qw(-mda --no-precheck)], $old_env, { 0 => $fh }),
@@ -492,7 +494,7 @@ SKIP: {
 
        diag 'waiting for PollInterval wakeup';
        PublicInbox::DS->SetPostLoopCallback(undef);
-       PublicInbox::DS->EventLoop;
+       PublicInbox::DS::event_loop();
        diag 'inbox unlocked (poll)';
        $w->kill;
        $w->join;
@@ -513,7 +515,7 @@ SKIP: {
                my @t0 = times;
                $w = start_script(['-watch'], undef, { 2 => $err_wr });
                seek($err, 0, 0);
-               tick until (grep(/I: \S+ idling/, <$err>));
+               tick until (grep(/# \S+ idling/, <$err>));
                diag 'killing imapd, waiting for CPU spins';
                my $delay = 0.11;
                $td->kill(9);
@@ -531,6 +533,34 @@ SKIP: {
        }
 }
 
+{
+       ok(my $ic = $imap_client->new(%mic_opt), 'logged in');
+       my $mb = "$ibx[0]->{newsgroup}.$first_range";
+       ok($ic->examine($mb), "EXAMINE $mb");
+       my $uidnext = $ic->uidnext($mb); # we'll fetch BODYSTRUCTURE on this
+       my $im = $ibx[0]->importer(0);
+       $im->add(PublicInbox::Eml->new(<<EOF)) or BAIL_OUT;
+Subject: test Ævar
+Message-ID: <smtputf8-delivered-mess\@age>
+From: Ævar Arnfjörð Bjarmason <avarab\@example>
+To: git\@vger.kernel.org
+
+EOF
+       $im->done;
+       my $envl = $ic->get_envelope($uidnext);
+       is($envl->{subject}, 'test Ævar', 'UTF-8 subject');
+       is($envl->{sender}->[0]->{personalname}, 'Ævar Arnfjörð Bjarmason',
+               'UTF-8 sender[0].personalname');
+       SKIP: {
+               skip 'need compress for comparisons', 1 if !$can_compress;
+               ok($ic = $imap_client->new(%mic_opt), 'uncompressed logged in');
+               ok($ic && $ic->compress, 'compress enabled');
+               ok($ic->examine($mb), "EXAMINE $mb");
+               my $raw = $ic->get_envelope($uidnext);
+               is_deeply($envl, $raw, 'raw and compressed match');
+       }
+}
+
 $td->kill;
 $td->join;
 is($?, 0, 'no error in exited process') if !$ENV{TEST_KILL_IMAPD};