t/edit: switch to use run_script

Perl parsing is slow, and run_script default behavior allows
this to speed up t/edit.t by over 100% in my case.

diff --git a/t/edit.t b/t/edit.t
index 5cb66a65ee13fd1c607502f5bf40f381482f9eaa..09e0cdddf4cb7e0c8bd0c4b4c364008f2282dd92 100644 (file)
--- a/t/edit.t
+++ b/t/edit.t
@@ -12,14 +12,12 @@ require PublicInbox::InboxWritable;
 require PublicInbox::Config;
 use PublicInbox::MID qw(mid_clean);
 
-my @mods = qw(IPC::Run DBI DBD::SQLite);
+my @mods = qw(DBI DBD::SQLite);
 foreach my $mod (@mods) {
        eval "require $mod";
        plan skip_all => "missing $mod for $0" if $@;
 };
-IPC::Run->import(qw(run));
 
-my $cmd_pfx = 'blib/script/public-inbox';
 my $tmpdir = tempdir('pi-edit-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $inboxdir = "$tmpdir/v2";
 my $ibx = PublicInbox::Inbox->new({
@@ -42,12 +40,13 @@ ok($im->add($mime), 'add message to be edited');
 $im->done;
 my ($in, $out, $err, $cmd, $cur, $t);
 my $git = PublicInbox::Git->new("$ibx->{inboxdir}/git/0.git");
+my $opt = { 0 => \$in, 1 => \$out, 2 => \$err };
 
 $t = '-F FILE'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/boolean prefix/bool pfx/'";
-       $cmd = [ "$cmd_pfx-edit", "-F$file", $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t edit OK");
+       $cmd = [ '-edit', "-F$file", $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t edit OK");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/bool pfx/, "$t message edited");
        like($out, qr/[a-f0-9]{40}/, "$t shows commit on success");
@@ -56,8 +55,8 @@ $t = '-F FILE'; {
 $t = '-m MESSAGE_ID'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/bool pfx/boolean prefix/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t edit OK");
+       $cmd = [ '-edit', "-m$mid", $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t edit OK");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/boolean prefix/, "$t message edited");
        like($out, qr/[a-f0-9]{40}/, "$t shows commit on success");
@@ -67,8 +66,8 @@ $t = 'no-op -m MESSAGE_ID'; {
        $in = $out = $err = '';
        my $before = $git->qx(qw(rev-parse HEAD));
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/bool pfx/boolean prefix/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
+       $cmd = [ '-edit', "-m$mid", $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t succeeds");
        my $prev = $cur;
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        is_deeply($cur, $prev, "$t makes no change");
@@ -82,10 +81,9 @@ $t = 'no-op -m MESSAGE_ID'; {
 $t = 'no-op -m MESSAGE_ID w/Status: header'; { # because mutt does it
        $in = $out = $err = '';
        my $before = $git->qx(qw(rev-parse HEAD));
-       local $ENV{MAIL_EDITOR} =
-                       "$^X -i -p -e 's/^Subject:.*/Status: RO\\n\$&/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
+       local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^Subject:.*/Status: RO\\n\$&/'";
+       $cmd = [ '-edit', "-m$mid", $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t succeeds");
        my $prev = $cur;
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        is_deeply($cur, $prev, "$t makes no change");
@@ -99,10 +97,9 @@ $t = 'no-op -m MESSAGE_ID w/Status: header'; { # because mutt does it
 
 $t = '-m MESSAGE_ID can change Received: headers'; {
        $in = $out = $err = '';
-       local $ENV{MAIL_EDITOR} =
-                       "$^X -i -p -e 's/^Subject:.*/Received: x\\n\$&/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
+       local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^Subject:.*/Received: x\\n\$&/'";
+       $cmd = [ '-edit', "-m$mid", $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t succeeds");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/boolean prefix/,
                "$t does not change Subject");
@@ -112,16 +109,16 @@ $t = '-m MESSAGE_ID can change Received: headers'; {
 $t = '-m miss'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/boolean/FAIL/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid-miss", $inboxdir ];
-       ok(!run($cmd, \$in, \$out, \$err), "$t fails on invalid MID");
+       $cmd = [ '-edit', "-m$mid-miss", $inboxdir ];
+       ok(!run_script($cmd, undef, $opt), "$t fails on invalid MID");
        like($err, qr/No message found/, "$t shows error");
 }
 
 $t = 'non-interactive editor failure'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 'END { exit 1 }'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
-       ok(!run($cmd, \$in, \$out, \$err), "$t detected");
+       $cmd = [ '-edit', "-m$mid", $inboxdir ];
+       ok(!run_script($cmd, undef, $opt), "$t detected");
        like($err, qr/END \{ exit 1 \}' failed:/, "$t shows error");
 }
 
@@ -132,9 +129,11 @@ $t = 'mailEditor set in config'; {
                        "$^X -i -p -e 's/boolean prefix/bool pfx/'");
        is($rc, 0, 'set publicinbox.mailEditor');
        local $ENV{MAIL_EDITOR};
+       delete $ENV{MAIL_EDITOR};
+       delete local $ENV{MAIL_EDITOR};
        local $ENV{GIT_EDITOR} = 'echo should not run';
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t edited message");
+       $cmd = [ '-edit', "-m$mid", $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t edited message");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->header('Subject'), qr/bool pfx/, "$t message edited");
        unlike($out, qr/should not run/, 'did not run GIT_EDITOR');
@@ -143,21 +142,21 @@ $t = 'mailEditor set in config'; {
 $t = '--raw and mbox escaping'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^\$/\\nFrom not mbox\\n/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", '--raw', $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
+       $cmd = [ '-edit', "-m$mid", '--raw', $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t succeeds");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->body, qr/^From not mbox/sm, 'put "From " line into body');
 
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^>From not/\$& an/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t succeeds with mbox escaping");
+       $cmd = [ '-edit', "-m$mid", $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t succeeds with mbox escaping");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        like($cur->body, qr/^From not an mbox/sm,
                'changed "From " line unescaped');
 
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^From not an mbox\\n//s'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", '--raw', $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t succeeds again");
+       $cmd = [ '-edit', "-m$mid", '--raw', $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t succeeds again");
        $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid));
        unlike($cur->body, qr/^From not an mbox/sm, "$t restored body");
 }
@@ -173,8 +172,8 @@ $t = 'reuse Message-ID'; {
 $t = 'edit ambiguous Message-ID with -m'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/bool pfx/boolean prefix/'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", $inboxdir ];
-       ok(!run($cmd, \$in, \$out, \$err), "$t fails w/o --force");
+       $cmd = [ '-edit', "-m$mid", $inboxdir ];
+       ok(!run_script($cmd, undef, $opt), "$t fails w/o --force");
        like($err, qr/Multiple messages with different content found matching/,
                "$t shows matches");
        like($err, qr/GIT_DIR=.*git show/is, "$t shows git commands");
@@ -183,8 +182,8 @@ $t = 'edit ambiguous Message-ID with -m'; {
 $t .= ' and --force'; {
        $in = $out = $err = '';
        local $ENV{MAIL_EDITOR} = "$^X -i -p -e 's/^Subject:.*/Subject:x/i'";
-       $cmd = [ "$cmd_pfx-edit", "-m$mid", '--force', $inboxdir ];
-       ok(run($cmd, \$in, \$out, \$err), "$t succeeds");
+       $cmd = [ '-edit', "-m$mid", '--force', $inboxdir ];
+       ok(run_script($cmd, undef, $opt), "$t succeeds");
        like($err, qr/Will edit all of them/, "$t notes all will be edited");
        my @dump = $git->qx(qw(cat-file --batch --batch-all-objects));
        chomp @dump;