t/lei-*: better diagnostics for occasional failures

Some of these have been failing occasionally, not sure
how, yet...

diff --git a/t/lei-q-kw.t b/t/lei-q-kw.t
index 074c573d768563f44510e8a1730914e40ffc2ac1..528751b4742e19eacd590535417baa0138aa6bc2 100644 (file)
--- a/t/lei-q-kw.t
+++ b/t/lei-q-kw.t
@@ -116,7 +116,7 @@ for my $sfx ('', '.gz') {
                }
                $res{$mid} = $eml;
        });
-       is_deeply(\%res, $exp, '--augment worked');
+       is_deeply(\%res, $exp, '--augment worked') or diag $lei_err;
 
        lei_ok(qw(q -o), "mboxrd:/dev/stdout", qw(m:qp@example.com)) or
                diag $lei_err;

diff --git a/t/lei-q-remote-import.t b/t/lei-q-remote-import.t
index 800670610f5129ab2d9f027e5243ac8b849bba68..7db684d941a4b24097d312c73abb6a47848b8304 100644 (file)
--- a/t/lei-q-remote-import.t
+++ b/t/lei-q-remote-import.t
@@ -49,10 +49,10 @@ test_lei({ tmpdir => $tmpdir }, sub {
 
        open my $fh, '>', "$o.lock";
        $cmd[-1] = 'm:qp@example.com';
-       unlink $o or BAIL_OUT $!;
+       unlink $o or xbail("unlink $o $! cwd=".Cwd::getcwd());
        lei_ok(@cmd, '--lock=none');
-       ok(-f $o && -s _, '--lock=none respected');
-       unlink $o or BAIL_OUT $!;
+       ok(-f $o && -s _, '--lock=none respected') or diag $lei_err;
+       unlink $o or xbail("unlink $o $! cwd=".Cwd::getcwd());
        ok(!lei(@cmd, '--lock=dotlock,timeout=0.000001'), 'dotlock fails');
        ok(-f $o && !-s _, 'nothing output on lock failure');
        unlink "$o.lock" or BAIL_OUT $!;

diff --git a/t/lei-q-save.t b/t/lei-q-save.t
index aed38a51e62e129c0a033a593d7ea96cee77a45d..bea6513392b66c60c8e3badfcc4bea670b0b2b0e 100644 (file)
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -25,7 +25,8 @@ test_lei(sub {
        lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt };
        lei_ok qw(q -q --save z:0.. d:last.week..), '-o', "MAILDIR:$home/md/";
        my %before = map { $_ => 1 } glob("$home/md/cur/*");
-       is_deeply(eml_load((keys %before)[0]), $doc1, 'doc1 matches');
+       my $f = (keys %before)[0] or xbail({before => \%before});
+       is_deeply(eml_load($f), $doc1, 'doc1 matches');
        lei_ok qw(ls-mail-sync);
        is($lei_out, "maildir:$home/md\n", 'canonicalized mail sync name');
 
@@ -45,7 +46,8 @@ test_lei(sub {
        my %after = map { $_ => 1 } glob("$home/md/{new,cur}/*");
        is(delete $after{(keys(%before))[0]}, 1, 'original message kept');
        is(scalar(keys %after), 1, 'one new message added');
-       is_deeply(eml_load((keys %after)[0]), $doc2, 'doc2 matches');
+       $f = (keys %after)[0] or xbail({after => \%after});
+       is_deeply(eml_load($f), $doc2, 'doc2 matches');
 
        # check stdin
        lei_ok [qw(q --save - -o), "mboxcl2:mbcl2" ],