rename {pi_config} fields to {pi_cfg}

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

diff --git a/t/imapd.t b/t/imapd.t
index 6cfced411c2288e73877392aab33062eedfdd405..43ec200cd25d6c54fc85da364b6d1f738affa011 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -39,11 +39,9 @@ for my $V (@V) {
        my $url = "http://example.com/i$V";
        my $inboxdir = "$tmpdir/$name";
        my $folder = "inbox.i$V";
-       my $cmd = ['-init', "-V$V", "-L$level", $name, $inboxdir, $url, $addr];
+       my $cmd = ['-init', "-V$V", "-L$level", "--ng=$folder",
+               $name, $inboxdir, $url, $addr];
        run_script($cmd) or BAIL_OUT("init $name");
-       xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config",
-                       "publicinbox.$name.newsgroup", $folder) == 0 or
-                       BAIL_OUT("setting newsgroup $V");
        if ($V == 1) {
                xsys(qw(git config), "--file=$ENV{HOME}/.public-inbox/config",
                        'publicinboxmda.spamcheck', 'none') == 0 or
@@ -124,9 +122,11 @@ $ret = $mic->search('uid 1:1') or BAIL_OUT "SEARCH FAIL $@";
 is_deeply($ret, [ 1 ], 'search UID 1:1 works');
 $ret = $mic->search('uid 1:*') or BAIL_OUT "SEARCH FAIL $@";
 is_deeply($ret, [ 1 ], 'search UID 1:* works');
+$ret = $mic->search('DELETED') or BAIL_OUT "SEARCH FAIL $@";
+is_deeply($ret, [], 'searching for DELETED returns nothing');
 
 SKIP: {
-       skip 'Xapian missing', 7 if $level eq 'basic';
+       skip 'Xapian missing', 8 if $level eq 'basic';
        my $x = $mic->search(qw(smaller 99999));
        is_deeply($x, [1], 'SMALLER works with Xapian (hit)');
        $x = $mic->search(qw(smaller 9));
@@ -139,6 +139,10 @@ SKIP: {
 
        $x = $mic->search(qw(HEADER Message-ID testmessage@example.com));
        is_deeply($x, [1], 'HEADER Message-ID works');
+
+       $x = $mic->search(qw(DRAFT HEADER Message-ID testmessage@example.com));
+       is_deeply($x, [], 'impossible (DRAFT) key filters out match');
+
        $x = $mic->search(qw(HEADER Message-ID miss));
        is_deeply($x, [], 'HEADER Message-ID can miss');
 
@@ -247,8 +251,8 @@ ok($mic->logout, 'logout works');
 
 my $have_inotify = eval { require Linux::Inotify2; 1 };
 
-my $pi_config = PublicInbox::Config->new;
-$pi_config->each_inbox(sub {
+my $pi_cfg = PublicInbox::Config->new;
+$pi_cfg->each_inbox(sub {
        my ($ibx) = @_;
        my $env = { ORIGINAL_RECIPIENT => $ibx->{-primary_address} };
        my $name = $ibx->{name};
@@ -367,6 +371,10 @@ EOF
        @hits = $mic->search('SENTSINCE' => '18-Apr-2020');
        is_deeply(\@hits, [], 'search on dummy with condition works');
        ok(!$mic->search('SENTSINCE' => '18-Abr-2020'), 'bad month fails');
+       $mic->Uid(0);
+       my $ret = $mic->fetch_hash(2, 'RFC822');
+       is_deeply($ret, {},
+               'MSN FETCH on empty dummy will not trigger warnings, later');
 }); # each_inbox
 
 # message sequence numbers :<
@@ -400,8 +408,11 @@ SKIP: {
        skip 'Xapian missing', 3 if $level eq 'basic';
        my $x = $mic->search(qw(header subject embedded));
        is(scalar(@$x), 1, 'MSN SEARCH on Subject works after rm');
-       $x = $mic->message_string($x->[0]);
-       is($x, $ret->{2}->{RFC822}, 'message 2 unchanged');
+       SKIP: {
+               skip 'previous test failed', 1 if !scalar(@$x);
+               $x = $mic->message_string($x->[0]);
+               is($x, $ret->{2}->{RFC822}, 'message 2 unchanged');
+       }
        $x = $mic->search(qw(text embedded));
        is(scalar(@$x), 1, 'MSN SEARCH on TEXT works after rm');
 }
@@ -445,7 +456,7 @@ ok($mic->logout, 'logged out');
 }
 
 SKIP: {
-       use_ok 'PublicInbox::WatchMaildir';
+       use_ok 'PublicInbox::Watch';
        use_ok 'PublicInbox::InboxIdle';
        require_git('1.8.5', 1) or
                skip('git 1.8.5+ needed for --urlmatch', 4);