diff options
Diffstat (limited to 't/lei-q-save.t')
| -rw-r--r-- | t/lei-q-save.t | 72 |
1 files changed, 49 insertions, 23 deletions
diff --git a/t/lei-q-save.t b/t/lei-q-save.t index 3d09fe37..0970bc3c 100644 --- a/t/lei-q-save.t +++ b/t/lei-q-save.t @@ -1,7 +1,8 @@ #!perl -w -# Copyright (C) 2021 all contributors <meta@public-inbox.org> +# Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> -use strict; use v5.10.1; use PublicInbox::TestCommon; +use v5.12; use PublicInbox::TestCommon; +use autodie qw(close open unlink); use PublicInbox::Smsg; use List::Util qw(sum); use File::Path qw(remove_tree); @@ -12,9 +13,10 @@ my $doc2 = eml_load('t/utf8.eml'); $doc2->header_set('Date', PublicInbox::Smsg::date({ds => time - (86400 * 4)})); my $doc3 = eml_load('t/msg_iter-order.eml'); $doc3->header_set('Date', PublicInbox::Smsg::date({ds => time - (86400 * 4)})); - +my $cat_env = { VISUAL => 'cat', EDITOR => 'cat' }; my $pre_existing = <<'EOF'; From x Mon Sep 17 00:00:00 2001 +From: <x@example.com> Message-ID: <import-before@example.com> Subject: pre-existing Date: Sat, 02 Oct 2010 00:00:00 +0000 @@ -88,7 +90,7 @@ test_lei(sub { like($lei_out, qr!^\Q$home/mbcl2\E$!sm, 'complete got mbcl2 output'); like($lei_out, qr!^\Q$home/md\E$!sm, 'complete got maildir output'); - unlink("$home/mbcl2") or xbail "unlink $!"; + unlink("$home/mbcl2"); lei_ok qw(_complete lei up); like($lei_out, qr!^\Q$home/mbcl2\E$!sm, 'mbcl2 output shown despite unlink'); @@ -96,24 +98,24 @@ test_lei(sub { ok(-f "$home/mbcl2" && -s _ == 0, 'up recreates on missing output'); # no --augment - open my $mb, '>', "$home/mbrd" or xbail "open $!"; + open my $mb, '>', "$home/mbrd"; print $mb $pre_existing; - close $mb or xbail "close: $!"; + close $mb; lei_ok(qw(q -o mboxrd:mbrd m:qp@example.com -C), $home); - open $mb, '<', "$home/mbrd" or xbail "open $!"; + open $mb, '<', "$home/mbrd"; is_deeply([grep(/pre-existing/, <$mb>)], [], 'pre-existing messsage gone w/o augment'); - close $mb; + undef $mb; lei_ok(qw(q m:import-before@example.com)); is(json_utf8->decode($lei_out)->[0]->{'s'}, 'pre-existing', '--save imported before clobbering'); # --augment - open $mb, '>', "$home/mbrd-aug" or xbail "open $!"; + open $mb, '>', "$home/mbrd-aug"; print $mb $pre_existing; - close $mb or xbail "close: $!"; + close $mb; lei_ok(qw(q -a -o mboxrd:mbrd-aug m:qp@example.com -C), $home); - open $mb, '<', "$home/mbrd-aug" or xbail "open $!"; + open $mb, '<', "$home/mbrd-aug"; $mb = do { local $/; <$mb> }; like($mb, qr/pre-existing/, 'pre-existing message preserved w/ -a'); like($mb, qr/<qp\@example\.com>/, 'new result written w/ -a'); @@ -183,7 +185,12 @@ test_lei(sub { lei_ok(qw(q z:0.. -o), "v2:$v2"); like($lei_err, qr/^# ([1-9][0-9]*) written to \Q$v2\E/sm, 'non-zero write output to stderr'); - lei_ok(qw(q z:0.. -o), "mboxrd:$home/before", '--only', $v2, '-j1,1'); + lei_ok('-C', $v2, qw(q z:0.. -o), "mboxrd:$home/before", + '--only', '.', '-j1,1'); + lei_ok(['edit-search', "$home/before"], $cat_env); + like($lei_out, qr/^\tonly = \Q$v2\E$/sm, + 'relative --only saved to absolute path'); + open my $fh, '<', "$home/before"; PublicInbox::MboxReader->mboxrd($fh, sub { push @before, $_[0] }); isnt(scalar(@before), 0, 'initial v2 written'); @@ -207,7 +214,7 @@ test_lei(sub { ok($shared < $orig, 'fewer bytes stored with --shared') or diag "shared=$shared orig=$orig"; - lei_ok([qw(edit-search), $v2s], { VISUAL => 'cat', EDITOR => 'cat' }); + lei_ok([qw(edit-search), $v2s], $cat_env); like($lei_out, qr/^\[lei/sm, 'edit-search can cat'); lei_ok('-C', "$home/v2s", qw(q -q -o ../s m:testmessage@example.com)); @@ -222,16 +229,14 @@ test_lei(sub { my @lss = glob("$home/" . '.local/share/lei/saved-searches/*/lei.saved-search'); my $out = xqx([qw(git config -f), $lss[0], 'lei.q.output']); - xsys($^X, qw(-i -p -e), "s/\\[/\\0/", $lss[0]) - and xbail "-ipe $lss[0]: $?"; + xsys_e($^X, qw(-w -i -p -e), "s/\\[/\\0/", $lss[0]); lei_ok qw(ls-search); like($lei_err, qr/bad config line.*?\Q$lss[0]\E/, 'git config parse error shown w/ lei ls-search'); lei_ok qw(up --all), \'up works with bad config'; like($lei_err, qr/bad config line.*?\Q$lss[0]\E/, 'git config parse error shown w/ lei up'); - xsys($^X, qw(-i -p -e), "s/\\0/\\[/", $lss[0]) - and xbail "-ipe $lss[0]: $?"; + xsys_e($^X, qw(-w -i -p -e), "s/\\0/\\[/", $lss[0]); lei_ok qw(ls-search); is($lei_err, '', 'no errors w/ fixed config'); @@ -243,17 +248,17 @@ test_lei(sub { my $d = "$home/d"; lei_ok [qw(import -q -F eml)], undef, - {0 => \"Subject: do not call\n\n"}; + {%$lei_opt, 0 => \"Subject: do not call\n\n"}; lei_ok qw(q -o), $d, 's:do not call'; my @orig = glob("$d/*/*"); is(scalar(@orig), 1, 'got one message via argv'); lei_ok [qw(import -q -Feml)], undef, - {0 => \"Subject: do not ever call\n\n"}; + {%$lei_opt, 0 => \"Subject: do not ever call\n\n"}; lei_ok 'up', $d; is_deeply([glob("$d/*/*")], \@orig, 'nothing written'); lei_ok [qw(import -q -Feml)], undef, - {0 => \"Subject: do not call, ever\n\n"}; + {%$lei_opt, 0 => \"Subject: do not call, ever\n\n"}; lei_ok 'up', $d; @after = glob("$d/*/*"); is(scalar(@after), 2, '2 total, messages, now'); @@ -264,14 +269,15 @@ test_lei(sub { 'up retrieved correct message'); $d = "$home/d-stdin"; - lei_ok [ qw(q -q -o), $d ], undef, { 0 => \'s:"do not ever call"' }; + lei_ok [ qw(q -q -o), $d ], undef, + { %$lei_opt, 0 => \'s:"do not ever call"' }; @orig = glob("$d/*/*"); is(scalar(@orig), 1, 'got one message via stdin'); lei_ok [qw(import -q -Feml)], undef, - {0 => \"Subject: do not fall or ever call\n\n"}; + {%$lei_opt, 0 => \"Subject: do not fall or ever call\n\n"}; lei_ok [qw(import -q -Feml)], undef, - {0 => \"Subject: do not ever call, again\n\n"}; + {%$lei_opt, 0 => \"Subject: do not ever call, again\n\n"}; lei_ok 'up', $d; @new = glob("$d/new/*"); is(scalar(@new), 1, "new message written to `new'") or do { @@ -281,5 +287,25 @@ test_lei(sub { is(eml_load($new[0])->header('Subject'), 'do not ever call, again', 'up retrieved correct message'); + # --thread expansion + $d = "$home/thread-expand"; + lei_ok(qw(q --no-external m:import-before@example.com -t -o), $d); + @orig = glob("$d/{new,cur}/*"); + is(scalar(@orig), 1, 'one result so far'); + lei_ok [ qw(import -Feml) ], undef, { %$lei_opt, 0 => \<<'EOM' }; +Date: Sun, 02 Oct 2023 00:00:00 +0000 +From: <x@example.com> +In-Reply-To: <import-before@example.com> +Message-ID: <reply1@example.com> +Subject: reply1 +EOM + + lei_ok qw(up), $d; + @new = glob("$d/{new,cur}/*"); + is(scalar(@new), 2, 'got new message'); + is_xdeeply([grep { $_ eq $orig[0] } @new], \@orig, + 'original message preserved on up w/ threads'); + lei_ok 'up', "$home/md", $d, \'multiple maildir up'; + unlike $lei_err, qr! line \d+!s, 'no warnings'; }); done_testing; |