t/lei: add more diagnostics for failures

[public-inbox.git] / t / lei-import-maildir.t

diff --git a/t/lei-import-maildir.t b/t/lei-import-maildir.t
index 5842e19efa6f652538c0d946151c4eeaa4709d41..6706b0148317a32a02cf47a019ff5835c2e582a2 100644 (file)
--- a/t/lei-import-maildir.t
+++ b/t/lei-import-maildir.t
@@ -10,24 +10,36 @@ test_lei(sub {
        }
        symlink(abs_path('t/data/0001.patch'), "$md/cur/x:2,S") or
                BAIL_OUT "symlink $md $!";
-       ok($lei->(qw(import), $md), 'import Maildir');
-       ok($lei->(qw(q s:boolean)), 'lei q');
+       lei_ok(qw(import), $md, \'import Maildir');
+       my $imp_err = $lei_err;
+       lei_ok(qw(q s:boolean));
        my $res = json_utf8->decode($lei_out);
-       like($res->[0]->{'s'}, qr/use boolean/, 'got expected result');
+       like($res->[0]->{'s'}, qr/use boolean/, 'got expected result')
+                       or diag explain($imp_err, $res);
        is_deeply($res->[0]->{kw}, ['seen'], 'keyword set');
        is($res->[1], undef, 'only got one result');
 
-       ok($lei->(qw(import), $md), 'import Maildir again');
-       ok($lei->(qw(q -d none s:boolean)), 'lei q w/o dedupe');
+       lei_ok(qw(import), $md, \'import Maildir again');
+       $imp_err = $lei_err;
+       lei_ok(qw(q -d none s:boolean), \'lei q w/o dedupe');
        my $r2 = json_utf8->decode($lei_out);
-       is_deeply($r2, $res, 'idempotent import');
-
+       is_deeply($r2, $res, 'idempotent import')
+                       or diag explain($imp_err, $res);
        rename("$md/cur/x:2,S", "$md/cur/x:2,SR") or BAIL_OUT "rename: $!";
-       ok($lei->(qw(import), $md), 'import Maildir after +answered');
-       ok($lei->(qw(q -d none s:boolean)), 'lei q after +answered');
+       lei_ok('import', "maildir:$md", \'import Maildir after +answered');
+       lei_ok(qw(q -d none s:boolean), \'lei q after +answered');
        $res = json_utf8->decode($lei_out);
        like($res->[0]->{'s'}, qr/use boolean/, 'got expected result');
        is_deeply($res->[0]->{kw}, ['answered', 'seen'], 'keywords set');
        is($res->[1], undef, 'only got one result');
+
+       symlink(abs_path('t/utf8.eml'), "$md/cur/u:2,ST") or
+               BAIL_OUT "symlink $md $!";
+       lei_ok('import', "maildir:$md", \'import Maildir w/ trashed message');
+       $imp_err = $lei_err;
+       lei_ok(qw(q -d none m:testmessage@example.com));
+       $res = json_utf8->decode($lei_out);
+       is_deeply($res, [ undef ], 'trashed message not imported')
+                       or diag explain($imp_err, $res);
 });
 done_testing;