X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=xt%2Fnet_writer-imap.t;h=cb2ea61ff8e365d307360e4bbef854fa309e2a15;hb=2186e8a06ca468f89a22fb66d8b337fa7bc0d8de;hp=11a10e742d68abe13fd1f62541457aa15b9004dc;hpb=2bc961811c57bef3feef24244bf20546f3754d4f;p=public-inbox.git diff --git a/xt/net_writer-imap.t b/xt/net_writer-imap.t index 11a10e74..cb2ea61f 100644 --- a/xt/net_writer-imap.t +++ b/xt/net_writer-imap.t @@ -19,11 +19,13 @@ require_mods('Mail::IMAPClient'); require_ok 'PublicInbox::NetWriter'; my $host = (split(/\./, hostname))[0]; my ($base) = ($0 =~ m!\b([^/]+)\.[^\.]+\z!); -my $folder = "INBOX.$base-$host-".strftime('%Y%m%d%H%M%S', gmtime(time)). +my $SEP = $ENV{IMAP_SEPARATOR} || '.'; +my $folder = "INBOX$SEP$base-$host-".strftime('%Y%m%d%H%M%S', gmtime(time)). "-$$-".sprintf('%x', int(rand(0xffffffff))); my $nwr = PublicInbox::NetWriter->new; chop($imap_url) if substr($imap_url, -1) eq '/'; -my $folder_uri = PublicInbox::URIimap->new("$imap_url/$folder"); +my $folder_url = "$imap_url/$folder"; +my $folder_uri = PublicInbox::URIimap->new($folder_url); is($folder_uri->mailbox, $folder, 'folder correct') or BAIL_OUT "BUG: bad $$uri"; $nwr->add_url($$folder_uri); @@ -120,13 +122,19 @@ test_lei(sub { } $set_cred_helper->("$ENV{HOME}/.gitconfig", $cred_set) if $cred_set; - lei_ok qw(q f:qp@example.com -o), $$folder_uri; + # don't combine these two: + $ENV{TEST_IMAP_COMPRESS} and lei_ok qw(config imap.compress true); + $ENV{TEST_IMAP_DEBUG} and lei_ok qw(config imap.debug true); + my $proxy = $ENV{TEST_IMAP_PROXY}; + lei_ok(qw(config imap.proxy), $proxy) if $proxy; + + lei_ok qw(q f:qp@example.com -o), $folder_url; $nwr->imap_each($folder_uri, $imap_slurp_all, my $res = []); is(scalar(@$res), 1, 'got one deduped result') or diag explain($res); is_deeply($res->[0]->[1], $plack_qp_eml, 'lei q wrote expected result'); - lei_ok qw(q f:matz -a -o), $$folder_uri; + lei_ok qw(q f:matz -a -o), $folder_url; $nwr->imap_each($folder_uri, $imap_slurp_all, my $aug = []); is(scalar(@$aug), 2, '2 results after augment') or diag explain($aug); my $exp = $res->[0]->[1]->as_string; @@ -136,13 +144,13 @@ test_lei(sub { is(scalar(grep { $_->[1]->as_string eq $exp } @$aug), 1, 'new result shown after augment'); - lei_ok qw(q s:thisbetternotgiveanyresult -o), $folder_uri->as_string; + lei_ok qw(q s:thisbetternotgiveanyresult -o), $folder_url; $nwr->imap_each($folder_uri, $imap_slurp_all, my $empty = []); is(scalar(@$empty), 0, 'no results w/o augment'); my $f = 't/utf8.eml'; # $exp = eml_load($f); - lei_ok qw(convert -F eml -o), $$folder_uri, $f; + lei_ok qw(convert -F eml -o), $folder_url, $f; my (@uid, @res); $nwr->imap_each($folder_uri, sub { my ($u, $uid, $kw, $eml) = @_; @@ -157,14 +165,30 @@ test_lei(sub { lei_ok qw(import -F eml), $f, \'import local copy w/o keywords'; - $nwr->imap_set_kw($folder_uri, $uid[0], [ 'seen' ])->expunge - or BAIL_OUT "expunge $@"; + lei_ok 'import', $folder_url; # populate mail_sync.sqlite3 + lei_ok qw(tag +kw:seen +kw:answered +kw:flagged), $f; + lei_ok 'ls-mail-sync'; + my @ls = split(/\n/, $lei_out); + is(scalar(@ls), 1, 'only one folder in ls-mail-sync') or xbail(\@ls); + for my $l (@ls) { + like($l, qr/;UIDVALIDITY=\d+\z/, 'UIDVALIDITY'); + } + lei_ok 'export-kw', $folder_url; + $mic = $nwr->mic_for_folder($folder_uri); + my $flags = $mic->flags($uid[0]); + is_deeply([sort @$flags], [ qw(\\Answered \\Flagged \\Seen) ], + 'IMAP flags set by export-kw') or diag explain($flags); + + # ensure this imap_set_kw clobbers + $nwr->imap_set_kw($mic, $uid[0], [ 'seen' ])->expunge or + BAIL_OUT "expunge $@"; + $mic = undef; @res = (); $nwr->imap_each($folder_uri, $imap_slurp_all, \@res); is_deeply(\@res, [ [ ['seen'], $exp ] ], 'seen flag set') or diag explain(\@res); - lei_ok qw(q s:thisbetternotgiveanyresult -o), $folder_uri->as_string, + lei_ok qw(q s:thisbetternotgiveanyresult -o), $folder_url, \'clobber folder but import flag'; $nwr->imap_each($folder_uri, $imap_slurp_all, $empty = []); is_deeply($empty, [], 'clobbered folder'); @@ -173,17 +197,18 @@ test_lei(sub { is_deeply([@$res{qw(m kw)}], ['testmessage@example.com', ['seen']], 'kw set'); + # prepare messages for watch $mic = $nwr->mic_for_folder($folder_uri); - for my $kw (qw(Deleted Seen Answered Draft)) { + for my $kw (qw(Deleted Seen Answered Draft forwarded)) { my $buf = < EOM - $mic->append_string($folder_uri->mailbox, $buf, "\\$kw") + my $f = $kw eq 'forwarded' ? '$Forwarded' : "\\$kw"; + $mic->append_string($folder_uri->mailbox, $buf, $f) or BAIL_OUT "append $kw $@"; } - # $mic->expunge or BAIL_OUT "expunge: $@"; $mic->disconnect; my $inboxdir = "$ENV{HOME}/wtest"; @@ -192,7 +217,7 @@ EOM run_script(\@cmd) or BAIL_OUT "init wtest"; xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config", 'publicinbox.wtest.watch', - $$folder_uri) == 0 or BAIL_OUT "git config $?"; + $folder_url) == 0 or BAIL_OUT "git config $?"; my $watcherr = "$ENV{HOME}/watch.err"; open my $err_wr, '>>', $watcherr or BAIL_OUT $!; my $pub_cfg = PublicInbox::Config->new; @@ -203,7 +228,7 @@ EOM $pub_cfg->each_inbox(sub { $_[0]->subscribe_unlock('ident', $obj) }); my $w = start_script(['-watch'], undef, { 2 => $err_wr }); diag 'waiting for initial fetch...'; - PublicInbox::DS->EventLoop; + PublicInbox::DS::event_loop(); my $ibx = $pub_cfg->lookup_name('wtest'); my $mm = $ibx->mm; ok(defined($mm->num_for('Seen@test.example.com')), @@ -214,6 +239,17 @@ EOM '-watch ignored \\Deleted'); ok(!defined($mm->num_for('Draft@test.example.com')), '-watch ignored \\Draft'); + ok(defined($mm->num_for('forwarded@test.example.com')), + '-watch takes forwarded message'); + undef $w; # done with watch + lei_ok qw(import), $folder_url; + lei_ok qw(q m:forwarded@test.example.com); + is_deeply(json_utf8->decode($lei_out)->[0]->{kw}, ['forwarded'], + 'forwarded kw imported from IMAP'); + + lei_ok qw(q m:testmessage --no-external -o), $folder_url; + lei_ok qw(up), $folder_url; + lei_ok qw(up --all=remote); }); undef $cleanup; # remove temporary folder