X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimapd.t;h=80757a9d4071610ccb66ce924a2690de07055a33;hb=7319f5d318a960eeb32a207d226eea7fd9ce2543;hp=1df9d26e5dea9190a51c034978795ba4bf1a8901;hpb=f692276e2bcce22160248f27a905e517e706a952;p=public-inbox.git diff --git a/t/imapd.t b/t/imapd.t index 1df9d26e..80757a9d 100644 --- a/t/imapd.t +++ b/t/imapd.t @@ -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, @@ -251,10 +250,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 +262,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'); @@ -302,9 +297,8 @@ $pi_cfg->each_inbox(sub { "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'); @@ -359,7 +353,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)); @@ -442,7 +436,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); @@ -452,11 +445,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", @@ -474,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>)); 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 @@ -501,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; @@ -511,7 +504,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