inboxidle: avoid needless syscalls on refresh

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

diff --git a/t/imapd.t b/t/imapd.t
index 4d627af7f102fb2bb80c5d5c934c45bbad0bb3cb..a464ad86058d374953a9c3bc943599fd2fa49bde 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -122,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));
@@ -137,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');
 
@@ -290,27 +296,11 @@ $pi_config->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
@@ -365,6 +355,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 :<
@@ -398,8 +392,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');
 }
@@ -443,7 +440,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);