test_common: require_mods bundles

[public-inbox.git] / t / lei-convert.t

diff --git a/t/lei-convert.t b/t/lei-convert.t
index 20099f65b89c7be6c5d1bb56f1be048b76873225..7ff628f9faa3a978084193462480b652752e16f6 100644 (file)
--- a/t/lei-convert.t
+++ b/t/lei-convert.t
@@ -6,8 +6,7 @@ use PublicInbox::MboxReader;
 use PublicInbox::MdirReader;
 use PublicInbox::NetReader;
 use PublicInbox::Eml;
-require_git 2.6;
-require_mods(qw(DBD::SQLite Search::Xapian Mail::IMAPClient Net::NNTP));
+require_mods(qw(lei -imapd -nntpd Mail::IMAPClient Net::NNTP));
 my ($tmpdir, $for_destroy) = tmpdir;
 my $sock = tcp_server;
 my $cmd = [ '-imapd', '-W0', "--stdout=$tmpdir/i1", "--stderr=$tmpdir/i2" ];
@@ -58,9 +57,10 @@ test_lei({ tmpdir => $tmpdir }, sub {
        ok(-d "$d/md", 'Maildir created');
        my @md;
        PublicInbox::MdirReader::maildir_each_eml("$d/md", sub {
-               push @md, $_[1];
+               push @md, $_[2];
        });
-       is(scalar(@md), scalar(@mboxrd), 'got expected emails in Maildir');
+       is(scalar(@md), scalar(@mboxrd), 'got expected emails in Maildir') or
+               diag $lei_err;
        @md = sort { ${$a->{bdy}} cmp ${$b->{bdy}} } @md;
        @mboxrd = sort { ${$a->{bdy}} cmp ${$b->{bdy}} } @mboxrd;
        my @rd_nostatus = map {
@@ -86,7 +86,7 @@ test_lei({ tmpdir => $tmpdir }, sub {
        my $exp = do { local $/; <$fh> };
        is($out, $exp, 'stdin => stdout');
 
-       lei_ok qw(convert -F eml -o mboxcl2:/dev/stdout t/plack-qp.eml);
+       lei_ok qw(convert -F eml -o mboxcl2:/dev/fd/1 t/plack-qp.eml);
        open $fh, '<', \$lei_out or BAIL_OUT;
        @bar = ();
        PublicInbox::MboxReader->mboxcl2($fh, sub {