lei export-kw: don't recreate deleted IMAP folders

[public-inbox.git] / xt / net_writer-imap.t

diff --git a/xt/net_writer-imap.t b/xt/net_writer-imap.t
index ec8f80d1444f6e1dd2f798ef3bf6a1592c4d6eef..afa4bcc3e8817bcd31f0c88ebe18378b0b41fbc3 100644 (file)
--- a/xt/net_writer-imap.t
+++ b/xt/net_writer-imap.t
@@ -19,7 +19,8 @@ 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 '/';
@@ -82,8 +83,11 @@ my $mics = do {
 };
 my $mic = (values %$mics)[0];
 my $cleanup = PublicInbox::OnDestroy->new($$, sub {
-       my $mic = $nwr->mic_get($uri);
-       $mic->delete($folder) or fail "delete $folder <$folder_uri>: $@";
+       if (defined($folder)) {
+               my $mic = $nwr->mic_get($uri);
+               $mic->delete($folder) or
+                       fail "delete $folder <$folder_uri>: $@";
+       }
        if ($tmpdir && -f "$tmpdir/.gitconfig") {
                local $ENV{HOME} = $tmpdir;
                system(qw(git credential-cache exit));
@@ -121,6 +125,12 @@ test_lei(sub {
        }
        $set_cred_helper->("$ENV{HOME}/.gitconfig", $cred_set) if $cred_set;
 
+       # 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);
@@ -221,7 +231,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')),
@@ -239,6 +249,18 @@ EOM
        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);
+       $mic = $nwr->mic_get($uri);
+       $mic->delete($folder) or fail "delete $folder <$folder_uri>: $@";
+       $mic->expunge;
+       undef $mic;
+       undef $folder;
+       ok(!lei(qw(export-kw), $folder_url),
+               'export-kw fails w/ non-existent folder');
+
 });
 
 undef $cleanup; # remove temporary folder