t/lei_to_mail: remove unnecessary arg passing

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

diff --git a/t/lei_to_mail.t b/t/lei_to_mail.t
index 47c0e3d4437106acfb2acb33aff6a3b104260661..6a571660d6861350787444d0615a19123070e54a 100644 (file)
--- a/t/lei_to_mail.t
+++ b/t/lei_to_mail.t
@@ -10,8 +10,10 @@ use Fcntl qw(SEEK_SET);
 use PublicInbox::Spawn qw(popen_rd which);
 use List::Util qw(shuffle);
 require_mods(qw(DBD::SQLite));
+require PublicInbox::MdirReader;
 require PublicInbox::MboxReader;
 require PublicInbox::LeiOverview;
+require PublicInbox::LEI;
 use_ok 'PublicInbox::LeiToMail';
 my $from = "Content-Length: 10\nSubject: x\n\nFrom hell\n";
 my $noeol = "Subject: x\n\nFrom hell";
@@ -73,7 +75,11 @@ for my $mbox (@MBOX) {
 my ($tmpdir, $for_destroy) = tmpdir();
 local $ENV{TMPDIR} = $tmpdir;
 open my $err, '>>', "$tmpdir/lei.err" or BAIL_OUT $!;
-my $lei = { 2 => $err };
+my $lei = bless { 2 => $err }, 'PublicInbox::LEI';
+my $commit = sub {
+       $_[0] = undef; # wcb
+       delete $lei->{1};
+};
 my $buf = <<'EOM';
 From: x@example.com
 Subject: x
@@ -95,12 +101,10 @@ my $wcb_get = sub {
                my $dup = Storable::thaw(Storable::freeze($l2m));
                is_deeply($dup, $l2m, "$fmt round-trips through storable");
        }
-       my $zpipe = $l2m->pre_augment($lei);
+       $l2m->pre_augment($lei);
        $l2m->do_augment($lei);
-       $l2m->post_augment($lei, $zpipe);
-       my $cb = $l2m->write_cb($lei);
-       delete $lei->{1};
-       $cb;
+       $l2m->post_augment($lei);
+       $l2m->write_cb($lei);
 };
 
 my $deadbeef = { blob => 'deadbeef', kw => [ qw(seen) ] };
@@ -109,7 +113,7 @@ my $orig = do {
        is(ref $wcb, 'CODE', 'write_cb returned callback');
        ok(-f $fn && !-s _, 'empty file created');
        $wcb->(\(my $dup = $buf), $deadbeef);
-       undef $wcb;
+       $commit->($wcb);
        open my $fh, '<', $fn or BAIL_OUT $!;
        my $raw = do { local $/; <$fh> };
        like($raw, qr/^blah\n/sm, 'wrote content');
@@ -119,11 +123,22 @@ my $orig = do {
        $wcb = $wcb_get->($mbox, $fn);
        ok(-f $fn && !-s _, 'truncated mbox destination');
        $wcb->(\($dup = $buf), $deadbeef);
-       undef $wcb;
+       $commit->($wcb);
        open $fh, '<', $fn or BAIL_OUT $!;
        is(do { local $/; <$fh> }, $raw, 'jobs > 1');
        $raw;
 };
+
+test_lei(sub {
+       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];
+       is($x->{'s'}, 'x', 'subject imported') or diag $lei_out;
+       is_deeply($x->{'kw'}, ['seen'], 'kw imported') or diag $lei_out;
+       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');
        SKIP: {
@@ -134,7 +149,7 @@ for my $zsfx (qw(gz bz2 xz)) { # XXX should we support zst, zz, lzo, lzma?
                my $f = "$fn.$zsfx";
                my $wcb = $wcb_get->($mbox, $f);
                $wcb->(\(my $dup = $buf), $deadbeef);
-               undef $wcb;
+               $commit->($wcb);
                my $uncompressed = xqx([@$dc_cmd, $f]);
                is($uncompressed, $orig, "$zsfx works unlocked");
 
@@ -142,13 +157,13 @@ for my $zsfx (qw(gz bz2 xz)) { # XXX should we support zst, zz, lzo, lzma?
                unlink $f or BAIL_OUT "unlink $!";
                $wcb = $wcb_get->($mbox, $f);
                $wcb->(\($dup = $buf), $deadbeef);
-               undef $wcb;
+               $commit->($wcb);
                is(xqx([@$dc_cmd, $f]), $orig, "$zsfx matches with lock");
 
                local $lei->{opt} = { augment => 1 };
                $wcb = $wcb_get->($mbox, $f);
                $wcb->(\($dup = $buf . "\nx\n"), $deadbeef);
-               undef $wcb; # commit
+               $commit->($wcb);
 
                my $cat = popen_rd([@$dc_cmd, $f]);
                my @raw;
@@ -160,7 +175,7 @@ for my $zsfx (qw(gz bz2 xz)) { # XXX should we support zst, zz, lzo, lzma?
                local $lei->{opt} = { augment => 1, jobs => 2 };
                $wcb = $wcb_get->($mbox, $f);
                $wcb->(\($dup = $buf . "\ny\n"), $deadbeef);
-               undef $wcb; # commit
+               $commit->($wcb);
 
                my @raw3;
                $cat = popen_rd([@$dc_cmd, $f]);
@@ -183,7 +198,7 @@ if ('default deduplication uses content_hash') {
        my $wcb = $wcb_get->('mboxo', $fn);
        $deadbeef->{kw} = [];
        $wcb->(\(my $x = $buf), $deadbeef) for (1..2);
-       undef $wcb; # undef to commit changes
+       $commit->($wcb);
        my $cmp = '';
        open my $fh, '<', $fn or BAIL_OUT $!;
        PublicInbox::MboxReader->mboxo($fh, sub { $cmp .= $as_orig->(@_) });
@@ -192,7 +207,7 @@ if ('default deduplication uses content_hash') {
        local $lei->{opt} = { augment => 1 };
        $wcb = $wcb_get->('mboxo', $fn);
        $wcb->(\($x = $buf . "\nx\n"), $deadbeef) for (1..2);
-       undef $wcb; # undef to commit changes
+       $commit->($wcb);
        open $fh, '<', $fn or BAIL_OUT $!;
        my @x;
        PublicInbox::MboxReader->mboxo($fh, sub { push @x, $as_orig->(@_) });
@@ -206,7 +221,7 @@ if ('default deduplication uses content_hash') {
        local $lei->{1} = $tmp;
        my $wcb = $wcb_get->('mboxrd', '/dev/stdout');
        $wcb->(\(my $x = $buf), $deadbeef);
-       undef $wcb; # commit
+       $commit->($wcb);
        seek($tmp, 0, SEEK_SET) or BAIL_OUT $!;
        my $cmp = '';
        PublicInbox::MboxReader->mboxrd($tmp, sub { $cmp .= $as_orig->(@_) });
@@ -220,13 +235,14 @@ SKIP: { # FIFO support
        my $cat = popen_rd([which('cat'), $fn]);
        my $wcb = $wcb_get->('mboxo', $fn);
        $wcb->(\(my $x = $buf), $deadbeef);
-       undef $wcb; # commit
+       $commit->($wcb);
        my $cmp = '';
        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 $md = "$tmpdir/maildir/";
        my $wcb = $wcb_get->('maildir', $md);
        is(ref($wcb), 'CODE', 'got Maildir callback');
@@ -234,7 +250,7 @@ SKIP: { # FIFO support
        $wcb->(\(my $x = $buf), $b4dc0ffee);
 
        my @f;
-       PublicInbox::LeiToMail::_maildir_each_file($md, sub { push @f, shift });
+       $each_file->($md, sub { push @f, shift });
        open my $fh, $f[0] or BAIL_OUT $!;
        is(do { local $/; <$fh> }, $buf, 'wrote to Maildir');
 
@@ -243,7 +259,7 @@ SKIP: { # FIFO support
        $wcb->(\($x = $buf."\nx\n"), $deadcafe);
 
        my @x = ();
-       PublicInbox::LeiToMail::_maildir_each_file($md, sub { push @x, shift });
+       $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 $!;
@@ -254,7 +270,7 @@ SKIP: { # FIFO support
        $wcb->(\($x = $buf."\ny\n"), $deadcafe);
        $wcb->(\($x = $buf."\ny\n"), $b4dc0ffee); # skipped by dedupe
        @f = ();
-       PublicInbox::LeiToMail::_maildir_each_file($md, sub { push @f, shift });
+       $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)');