diff options
| -rw-r--r-- | lib/PublicInbox/LeiImport.pm | 6 | ||||
| -rw-r--r-- | lib/PublicInbox/TestCommon.pm | 4 | ||||
| -rw-r--r-- | t/lei-mark.t | 2 | ||||
| -rw-r--r-- | t/lei-q-kw.t | 6 |
4 files changed, 10 insertions, 8 deletions
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index 9da6b7f9..7c5b7d09 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -39,14 +39,14 @@ sub import_done_wait { # dwaitpid callback my ($arg, $pid) = @_; my ($imp, $lei) = @$arg; $lei->child_error($?, 'non-fatal errors during import') if $?; - my $sto = delete $lei->{sto}; - my $wait = $sto->ipc_do('done') if $sto; # PublicInbox::LeiStore::done + my $sto = delete $lei->{sto} // return $lei->fail('BUG: {sto} gone'); + my $wait = $sto->ipc_do('done'); # PublicInbox::LeiStore::done $lei->dclose; } sub import_done { # EOF callback for main daemon my ($lei) = @_; - my $imp = delete $lei->{imp} or return; + my $imp = delete $lei->{imp} // return $lei->fail('BUG: {imp} gone'); $imp->wq_wait_old(\&import_done_wait, $lei); } diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm index ca165a04..72617a78 100644 --- a/lib/PublicInbox/TestCommon.pm +++ b/lib/PublicInbox/TestCommon.pm @@ -17,7 +17,7 @@ BEGIN { run_script start_script key2sub xsys xsys_e xqx eml_load tick have_xapian_compact json_utf8 setup_public_inboxes create_inbox tcp_host_port test_lei lei lei_ok $lei_out $lei_err $lei_opt - test_httpd); + test_httpd xbail); require Test::More; my @methods = grep(!/\W/, @Test::More::EXPORT); eval(join('', map { "*$_=\\&Test::More::$_;" } @methods)); @@ -25,6 +25,8 @@ BEGIN { push @EXPORT, @methods; } +sub xbail (@) { BAIL_OUT join(' ', map { ref ? (explain($_)) : ($_) } @_) } + sub eml_load ($) { my ($path, $cb) = @_; open(my $fh, '<', $path) or die "open $path: $!"; diff --git a/t/lei-mark.t b/t/lei-mark.t index ddf5634c..76995589 100644 --- a/t/lei-mark.t +++ b/t/lei-mark.t @@ -30,7 +30,7 @@ test_lei(sub { ok(-s $mb, 'wrote mbox result'); lei_ok(qw(q m:testmessage@example.com -o), $md); my @fn = glob("$md/cur/*"); - scalar(@fn) == 1 or BAIL_OUT 'no mail '.explain(\@fn); + scalar(@fn) == 1 or xbail $lei_err, 'no mail', \@fn; rename($fn[0], "$fn[0]S") or BAIL_OUT "rename $!"; $check_kw->(['flagged'], msg => 'after bad request'); lei_ok(qw(mark -F eml t/utf8.eml -kw:flagged)); diff --git a/t/lei-q-kw.t b/t/lei-q-kw.t index 4db27363..c17411fb 100644 --- a/t/lei-q-kw.t +++ b/t/lei-q-kw.t @@ -21,7 +21,7 @@ lei_ok(qw(import -F eml t/plack-qp.eml)); my $o = "$ENV{HOME}/dst"; lei_ok(qw(q -o), "maildir:$o", qw(m:qp@example.com)); my @fn = glob("$o/cur/*:2,"); -scalar(@fn) == 1 or BAIL_OUT "wrote multiple or zero files: ".explain(\@fn); +scalar(@fn) == 1 or xbail $lei_err, 'wrote multiple or zero files:', \@fn; rename($fn[0], "$fn[0]S") or BAIL_OUT "rename $!"; lei_ok(qw(q -o), "maildir:$o", qw(m:bogus-noresults@example.com)); @@ -124,7 +124,7 @@ lei_ok(qw(q -o), $o, "m:$m", @inc); # emulate MUA marking a Maildir message as read: @fn = glob("$o/cur/*"); -scalar(@fn) == 1 or BAIL_OUT "wrote multiple or zero files: ".explain(\@fn); +scalar(@fn) == 1 or xbail $lei_err, 'wrote multiple or zero files:', \@fn; rename($fn[0], "$fn[0]S") or BAIL_OUT "rename $!"; lei_ok(qw(q -o), $o, 'bogus', \'clobber output dir to import keywords'); @@ -178,7 +178,7 @@ $m = 'multipart@example.com'; $o = "$ENV{HOME}/fuzz"; lei_ok('q', '-o', $o, "m:$m", @inc); @fn = glob("$o/cur/*"); -scalar(@fn) == 1 or BAIL_OUT "wrote multiple or zero files: ".explain(\@fn); +scalar(@fn) == 1 or xbail $lei_err, "wrote multiple or zero files", \@fn; rename($fn[0], "$fn[0]S") or BAIL_OUT "rename $!"; lei_ok('q', '-o', $o, "m:$m"); is_deeply([glob("$o/cur/*")], [], 'clobbered output results'); |