t/imapd.t: skip dependent test on failure

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

diff --git a/t/imapd.t b/t/imapd.t
index 4d627af7f102fb2bb80c5d5c934c45bbad0bb3cb..cb95fa5d053380760f88c29c80da4ce2b0b240a5 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');
 
@@ -398,8 +404,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 +452,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);