X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimapd.t;h=3c74aefd4beeeb806697e55dc503a720aecff5ef;hb=e28f33dc1b6e6a296946c0c58b43900c6cbd07f7;hp=43ec200cd25d6c54fc85da364b6d1f738affa011;hpb=0d38f65c490466837ae091afa7a7b6f59d04ce7c;p=public-inbox.git
diff --git a/t/imapd.t b/t/imapd.t
index 43ec200c..3c74aefd 100644
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -1,5 +1,5 @@
#!perl -w
-# Copyright (C) 2020 all contributors
+# Copyright (C) all contributors
# License: AGPL-3.0+
# end-to-end IMAP tests, see unit tests in t/imap.t, too
use strict;
@@ -7,9 +7,7 @@ use Test::More;
use Time::HiRes ();
use PublicInbox::TestCommon;
use PublicInbox::Config;
-use PublicInbox::Spawn qw(which);
-require_mods(qw(DBD::SQLite Mail::IMAPClient Mail::IMAPClient::BodyStructure
- Email::Address::XS||Mail::Address Parse::RecDescent));
+require_mods(qw(-imapd Mail::IMAPClient));
my $imap_client = 'Mail::IMAPClient';
my $can_compress = $imap_client->can('compress');
if ($can_compress) { # hope this gets fixed upstream, soon
@@ -31,40 +29,41 @@ push(@V, 2) if require_git('2.6', 1);
my ($tmpdir, $for_destroy) = tmpdir();
my $home = "$tmpdir/home";
-local $ENV{HOME} = $home;
-
+BAIL_OUT "mkdir: $!" unless (mkdir($home) and mkdir("$home/.public-inbox"));
+my @ibx;
+open my $cfgfh, '>', "$home/.public-inbox/config" or BAIL_OUT;
+print $cfgfh < $addr };
- run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or
- BAIL_OUT('-mda delivery');
- if ($V == 1) {
- run_script(['-index', $inboxdir]) or BAIL_OUT("index $?");
- }
+ 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;
+ });
+ push @ibx, $ibx;
+ $ibx->{newsgroup} = "inbox.i$V";
+ print $cfgfh <{inboxdir}
+ address = $ibx->{-primary_address};
+ newsgroup = inbox.i$V
+ url = http://example.com/i$V
+ indexlevel = $level
+EOF
}
+close $cfgfh or BAIL_OUT;
+local $ENV{HOME} = $home;
my $sock = tcp_server();
my $err = "$tmpdir/stderr.log";
my $out = "$tmpdir/stdout.log";
my $cmd = [ '-imapd', '-W0', "--stdout=$out", "--stderr=$err" ];
my $td = start_script($cmd, undef, { 3 => $sock }) or BAIL_OUT("-imapd: $?");
-my %mic_opt = (
- Server => $sock->sockhost,
- Port => $sock->sockport,
- Uid => 1,
-);
+my ($ihost, $iport) = tcp_host_port($sock);
+my %mic_opt = ( Server => $ihost, Port => $iport, Uid => 1 );
my $mic = $imap_client->new(%mic_opt);
my $pre_login_capa = $mic->capability;
is(grep(/\AAUTH=ANONYMOUS\z/, @$pre_login_capa), 1,
@@ -100,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;
@@ -251,10 +251,7 @@ ok($mic->logout, 'logout works');
my $have_inotify = eval { require Linux::Inotify2; 1 };
-my $pi_cfg = PublicInbox::Config->new;
-$pi_cfg->each_inbox(sub {
- my ($ibx) = @_;
- my $env = { ORIGINAL_RECIPIENT => $ibx->{-primary_address} };
+for my $ibx (@ibx) {
my $name = $ibx->{name};
my $ng = $ibx->{newsgroup};
my $mic = $imap_client->new(%mic_opt);
@@ -266,10 +263,9 @@ $pi_cfg->each_inbox(sub {
ok(!$mic->idle, "IDLE fails w/o SELECT/EXAMINE $name");
ok($mic->examine($mb), "EXAMINE $ng succeeds");
ok(my $idle_tag = $mic->idle, "IDLE succeeds on $ng");
-
- open(my $fh, '<', 't/data/message_embed.eml') or BAIL_OUT("open: $!");
- run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or
- BAIL_OUT('-mda delivery');
+ my $im = $ibx->importer(0);
+ $im->add(eml_load 't/data/message_embed.eml') or BAIL_OUT;
+ $im->done;
my $t0 = Time::HiRes::time();
ok(my @res = $mic->idle_data(11), "IDLE succeeds on $ng");
is(grep(/\A\* [0-9] EXISTS\b/, @res), 1, 'got EXISTS message');
@@ -296,31 +292,14 @@ $pi_cfg->each_inbox(sub {
# ensure IDLE persists across HUP, w/o extra watches or FDs
$td->kill('HUP') or BAIL_OUT "failed to kill -imapd: $!";
- SKIP: {
- skip 'no inotify fdinfo (or support)', 2 if !@ino_info;
- my (@tmp, %prev);
- local $/ = "\n";
- my $end = time + 5;
- until (time > $end) {
- select undef, undef, undef, 0.01;
- open my $fh, '<', $ino_fdinfo or
- BAIL_OUT "$ino_fdinfo: $!";
- %prev = map { $_ => 1 } @ino_info;
- @tmp = grep(/^inotify wd:/, <$fh>);
- if (scalar(@tmp) == scalar(@ino_info)) {
- delete @prev{@tmp};
- last if scalar(keys(%prev)) == @ino_info;
- }
- }
- is(scalar @tmp, scalar @ino_info,
- 'old inotify watches replaced');
- is(scalar keys %prev, scalar @ino_info,
- 'no previous watches overlap');
- };
+ for my $n (1..2) { # kick the event loop so we know HUP is done
+ my $m = $imap_client->new(%mic_opt);
+ ok($m->login && $m->IsAuthenticated && $m->logout,
+ "connection $n works after HUP");
+ }
- open($fh, '<', 't/data/0001.patch') or BAIL_OUT("open: $!");
- run_script(['-mda', '--no-precheck'], $env, { 0 => $fh }) or
- BAIL_OUT('-mda delivery');
+ $im->add(eml_load 't/data/0001.patch') or BAIL_OUT;
+ $im->done;
$t0 = Time::HiRes::time();
ok(@res = $mic->idle_data(11), "IDLE succeeds on $ng after HUP");
is(grep(/\A\* [0-9] EXISTS\b/, @res), 1, 'got EXISTS message');
@@ -375,7 +354,7 @@ EOF
my $ret = $mic->fetch_hash(2, 'RFC822');
is_deeply($ret, {},
'MSN FETCH on empty dummy will not trigger warnings, later');
-}); # each_inbox
+}; # for @ibx
# message sequence numbers :<
is($mic->Uid(0), 0, 'disable UID on '.ref($mic));
@@ -387,11 +366,13 @@ is(scalar keys %$ret, 3, 'got all 3 messages');
SKIP: {
# do any clients use non-UID IMAP SEARCH?
- skip 'Xapian missing', 2 if $level eq 'basic';
+ skip 'Xapian missing', 3 if $level eq 'basic';
my $x = $mic->search('all');
is_deeply($x, [1, 2, 3], 'MSN SEARCH works before rm');
$x = $mic->search(qw(header subject embedded));
is_deeply($x, [2], 'MSN SEARCH on Subject works before rm');
+ $x = $mic->search('FROM scraper@example.com');
+ is_deeply($x, [], "MSN SEARCH miss won't trigger warnings");
}
{
@@ -456,7 +437,6 @@ ok($mic->logout, 'logged out');
}
SKIP: {
- use_ok 'PublicInbox::Watch';
use_ok 'PublicInbox::InboxIdle';
require_git('1.8.5', 1) or
skip('git 1.8.5+ needed for --urlmatch', 4);
@@ -466,11 +446,10 @@ SKIP: {
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];
- my ($ihost, $iport) = ($sock->sockhost, $sock->sockport);
my $imapurl = "imap://$ihost:$iport/inbox.i1.0";
run_script($cmd) or BAIL_OUT("init $name");
xsys(qw(git config), "--file=$home/.public-inbox/config",
@@ -488,17 +467,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
@@ -507,7 +487,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 }),
@@ -515,7 +495,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;
@@ -525,7 +505,7 @@ SKIP: {
$ii->close;
PublicInbox::DS->Reset;
seek($err, 0, 0);
- my @err = grep(!/^I:/, <$err>);
+ my @err = grep(!/^(?:I:|#)/, <$err>);
is(@err, 0, 'no warnings/errors from -watch'.join(' ', @err));
if ($ENV{TEST_KILL_IMAPD}) { # not sure how reliable this test can be
@@ -536,7 +516,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);