X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fedit.t;h=e6e0f9cfe48b7b46ac79a68968e5bfaa047c48d4;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hp=5cb66a65ee13fd1c607502f5bf40f381482f9eaa;hpb=f6f7f6e31345d2146b4a38069605171e74244460;p=public-inbox.git diff --git a/t/edit.t b/t/edit.t index 5cb66a65..e6e0f9cf 100644 --- a/t/edit.t +++ b/t/edit.t @@ -1,76 +1,58 @@ -# Copyright (C) 2019 all contributors +#!perl -w +# Copyright (C) 2019-2021 all contributors # License: AGPL-3.0+ # edit frontend behavior test (t/replace.t for backend) use strict; -use warnings; -use Test::More; -use File::Temp qw/tempdir/; -require './t/common.perl'; -require_git(2.6); -require PublicInbox::Inbox; -require PublicInbox::InboxWritable; -require PublicInbox::Config; +use v5.10.1; +use PublicInbox::TestCommon; use PublicInbox::MID qw(mid_clean); +require_git(2.6); -my @mods = qw(IPC::Run 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); +require_mods('DBD::SQLite'); +my ($tmpdir, $for_destroy) = tmpdir(); my $inboxdir = "$tmpdir/v2"; -my $ibx = PublicInbox::Inbox->new({ - inboxdir => $inboxdir, - name => 'test-v2edit', - version => 2, - -primary_address => 'test@example.com', - indexlevel => 'basic', -}); -$ibx = PublicInbox::InboxWritable->new($ibx, {nproc=>1}); +my $file = 't/data/0001.patch'; +my $eml = eml_load($file); +my $mid = mid_clean($eml->header('Message-ID')); +my $ibx = create_inbox 'v2edit', indexlevel => 'basic', version => 2, + tmpdir => $inboxdir, sub { + my ($im, $ibx) = @_; + $im->add($eml) or BAIL_OUT; +}; my $cfgfile = "$tmpdir/config"; local $ENV{PI_CONFIG} = $cfgfile; -my $file = 't/data/0001.patch'; -open my $fh, '<', $file or die "open: $!"; -my $raw = do { local $/; <$fh> }; -my $im = $ibx->importer(0); -my $mime = PublicInbox::MIME->new($raw); -my $mid = mid_clean($mime->header('Message-Id')); -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"); - $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid)); + $cmd = [ '-edit', "-F$file", $inboxdir ]; + ok(run_script($cmd, undef, $opt), "$t edit OK"); + $cur = PublicInbox::Eml->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"); + like($out, qr/[a-f0-9]{40,}/, "$t shows commit on success"); } $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"); - $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid)); + $cmd = [ '-edit', "-m$mid", $inboxdir ]; + ok(run_script($cmd, undef, $opt), "$t edit OK"); + $cur = PublicInbox::Eml->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"); + like($out, qr/[a-f0-9]{40,}/, "$t shows commit on success"); } $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)); + $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid)); is_deeply($cur, $prev, "$t makes no change"); like($cur->header('Subject'), qr/boolean prefix/, "$t does not change message"); @@ -82,12 +64,11 @@ $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)); + $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid)); is_deeply($cur, $prev, "$t makes no change"); like($cur->header('Subject'), qr/boolean prefix/, "$t does not change message"); @@ -99,11 +80,10 @@ $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"); - $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid)); + 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::Eml->new($ibx->msg_by_mid($mid)); like($cur->header('Subject'), qr/boolean prefix/, "$t does not change Subject"); is($cur->header('Received'), 'x', 'added Received header'); @@ -112,30 +92,31 @@ $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"); } $t = 'mailEditor set in config'; { $in = $out = $err = ''; - my $rc = system(qw(git config), "--file=$cfgfile", + my $rc = xsys(qw(git config), "--file=$cfgfile", 'publicinbox.maileditor', "$^X -i -p -e 's/boolean prefix/bool pfx/'"); is($rc, 0, 'set publicinbox.mailEditor'); local $ENV{MAIL_EDITOR}; + delete $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"); - $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid)); + $cmd = [ '-edit', "-m$mid", $inboxdir ]; + ok(run_script($cmd, undef, $opt), "$t edited message"); + $cur = PublicInbox::Eml->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,29 +124,30 @@ $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"); - $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid)); + $cmd = [ '-edit', "-m$mid", '--raw', $inboxdir ]; + ok(run_script($cmd, undef, $opt), "$t succeeds"); + $cur = PublicInbox::Eml->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"); - $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid)); + $cmd = [ '-edit', "-m$mid", $inboxdir ]; + ok(run_script($cmd, undef, $opt), "$t succeeds with mbox escaping"); + $cur = PublicInbox::Eml->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"); - $cur = PublicInbox::MIME->new($ibx->msg_by_mid($mid)); + $cmd = [ '-edit', "-m$mid", '--raw', $inboxdir ]; + ok(run_script($cmd, undef, $opt), "$t succeeds again"); + $cur = PublicInbox::Eml->new($ibx->msg_by_mid($mid)); unlike($cur->body, qr/^From not an mbox/sm, "$t restored body"); } $t = 'reuse Message-ID'; { my @warn; local $SIG{__WARN__} = sub { push @warn, @_ }; - ok($im->add($mime), "$t and re-add"); + my $im = $ibx->importer(0); + ok($im->add($eml), "$t and re-add"); $im->done; like($warn[0], qr/reused for mismatched content/, "$t got warning"); } @@ -173,8 +155,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 +165,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;