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 1ac6a4ab64ecc28c4dbdb00286e2d3ce29b2ef45..cb95fa5d053380760f88c29c80da4ce2b0b240a5 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
@@ -87,12 +85,16 @@ my $post_auth_anon_capa = $mic->capability;
 is_deeply($post_auth_anon_capa, $post_login_capa,
        'auth anon has same capabilities');
 my $e;
+ok($mic->noop, 'NOOP');
+ok($mic->noop, 'NOOP (again)'); # for warnings
 ok(!$mic->examine('foo') && ($e = $@), 'EXAMINE non-existent');
 like($e, qr/\bNO\b/, 'got a NO on EXAMINE for non-existent');
 ok(!$mic->select('foo') && ($e = $@), 'EXAMINE non-existent');
 like($e, qr/\bNO\b/, 'got a NO on EXAMINE for non-existent');
 my $mailbox1 = "inbox.i1.$first_range";
 ok($mic->select('inbox.i1'), 'SELECT on parent succeeds');
+ok($mic->noop, 'NOOP while selected');
+ok($mic->noop, 'NOOP again while selected'); # check warnings later
 ok($mic->select($mailbox1), 'SELECT succeeds');
 ok($mic->examine($mailbox1), 'EXAMINE succeeds');
 my @raw = $mic->status($mailbox1, qw(Messages uidnext uidvalidity));
@@ -120,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));
@@ -135,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');
 
@@ -396,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');
 }
@@ -441,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);