lei: maildir: move shard support to MdirReader

[public-inbox.git] / t / lei_to_mail.t

diff --git a/t/lei_to_mail.t b/t/lei_to_mail.t
index 72b9070097a024fb282f94fc1e2b3e830020ae1c..513572579274fef5f49e7e1cfe14b687f28023b6 100644 (file)
--- a/t/lei_to_mail.t
+++ b/t/lei_to_mail.t
@@ -6,8 +6,8 @@ use v5.10.1;
 use Test::More;
 use PublicInbox::TestCommon;
 use PublicInbox::Eml;
-use Fcntl qw(SEEK_SET);
-use PublicInbox::Spawn qw(popen_rd which);
+use Fcntl qw(SEEK_SET O_RDONLY O_NONBLOCK);
+use PublicInbox::Spawn qw(popen_rd);
 use List::Util qw(shuffle);
 require_mods(qw(DBD::SQLite));
 require PublicInbox::MdirReader;
@@ -28,7 +28,7 @@ for my $mbox (@MBOX) {
        my $s = $cb->(PublicInbox::Eml->new($from), $smsg);
        is(substr($$s, -1, 1), "\n", "trailing LF in normal $mbox");
        my $eml = PublicInbox::Eml->new($s);
-       is($eml->header('Status'), 'OR', "Status: set by $m");
+       is($eml->header('Status'), 'RO', "Status: set by $m");
        is($eml->header('X-Status'), 'AF', "X-Status: set by $m");
        if ($mbox eq 'mboxcl2') {
                like($eml->body_raw, qr/^From /, "From not escaped $m");
@@ -130,7 +130,7 @@ my $orig = do {
 };
 
 test_lei(sub {
-       ok(lei(qw(import -f), $mbox, $fn), 'imported mbox');
+       ok(lei(qw(import -F), $mbox, $fn), 'imported mbox');
        ok(lei(qw(q s:x)), 'lei q works') or diag $lei_err;
        my $res = json_utf8->decode($lei_out);
        my $x = $res->[0];
@@ -149,8 +149,8 @@ test_lei(sub {
        is($res->[1], undef, 'only one result');
 });
 
-for my $zsfx (qw(gz bz2 xz)) { # XXX should we support zst, zz, lzo, lzma?
-       my $zsfx2cmd = PublicInbox::LeiToMail->can('zsfx2cmd');
+my $zsfx2cmd = PublicInbox::MboxReader->can('zsfx2cmd');
+for my $zsfx (qw(gz bz2 xz)) {
        SKIP: {
                my $cmd = eval { $zsfx2cmd->($zsfx, 0, $lei) };
                skip $@, 3 if $@;
@@ -242,17 +242,18 @@ SKIP: { # FIFO support
        use POSIX qw(mkfifo);
        my $fn = "$tmpdir/fifo";
        mkfifo($fn, 0600) or skip("mkfifo not supported: $!", 1);
-       my $cat = popen_rd([which('cat'), $fn]);
+       sysopen(my $cat, $fn, O_RDONLY|O_NONBLOCK) or BAIL_OUT $!;
        my $wcb = $wcb_get->('mboxo', $fn);
        $wcb->(\(my $x = $buf), $deadbeef);
        $commit->($wcb);
        my $cmp = '';
+       $cat->blocking(1);
        PublicInbox::MboxReader->mboxo($cat, sub { $cmp .= $as_orig->(@_) });
        is($cmp, $buf, 'message written to FIFO');
 }
 
 { # Maildir support
-       my $each_file = PublicInbox::MdirReader->can('maildir_each_file');
+       my $mdr = PublicInbox::MdirReader->new;
        my $md = "$tmpdir/maildir/";
        my $wcb = $wcb_get->('maildir', $md);
        is(ref($wcb), 'CODE', 'got Maildir callback');
@@ -260,7 +261,7 @@ SKIP: { # FIFO support
        $wcb->(\(my $x = $buf), $b4dc0ffee);
 
        my @f;
-       $each_file->($md, sub { push @f, shift });
+       $mdr->maildir_each_file($md, sub { push @f, shift });
        open my $fh, $f[0] or BAIL_OUT $!;
        is(do { local $/; <$fh> }, $buf, 'wrote to Maildir');
 
@@ -269,7 +270,7 @@ SKIP: { # FIFO support
        $wcb->(\($x = $buf."\nx\n"), $deadcafe);
 
        my @x = ();
-       $each_file->($md, sub { push @x, shift });
+       $mdr->maildir_each_file($md, sub { push @x, shift });
        is(scalar(@x), 1, 'wrote one new file');
        ok(!-f $f[0], 'old file clobbered');
        open $fh, $x[0] or BAIL_OUT $!;
@@ -280,7 +281,7 @@ SKIP: { # FIFO support
        $wcb->(\($x = $buf."\ny\n"), $deadcafe);
        $wcb->(\($x = $buf."\ny\n"), $b4dc0ffee); # skipped by dedupe
        @f = ();
-       $each_file->($md, sub { push @f, shift });
+       $mdr->maildir_each_file($md, sub { push @f, shift });
        is(scalar grep(/\A\Q$x[0]\E\z/, @f), 1, 'old file still there');
        my @new = grep(!/\A\Q$x[0]\E\z/, @f);
        is(scalar @new, 1, '1 new file written (b4dc0ffee skipped)');