X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei-q-save.t;h=05d5d9f4436cd0bb5feeee68887641a19384b50d;hb=f64adbd5e3c35197c1915bca108cdcd81f74f708;hp=b1ca4e92ab656ea1ff6792d05b57bf870e895814;hpb=d15bd6a20a836473479d8431682ba305e2dcdfbe;p=public-inbox.git diff --git a/t/lei-q-save.t b/t/lei-q-save.t index b1ca4e92..05d5d9f4 100644 --- a/t/lei-q-save.t +++ b/t/lei-q-save.t @@ -25,7 +25,7 @@ test_lei(sub { my $home = $ENV{HOME}; my $in = $doc1->as_string; lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt }; - lei_ok qw(q -q --save z:0.. d:last.week..), '-o', "MAILDIR:$home/md/"; + lei_ok qw(q -q z:0.. d:last.week..), '-o', "MAILDIR:$home/md/"; my %before = map { $_ => 1 } glob("$home/md/cur/*"); my $f = (keys %before)[0] or xbail({before => \%before}); is_deeply(eml_load($f), $doc1, 'doc1 matches'); @@ -52,8 +52,8 @@ test_lei(sub { is_deeply(eml_load($f), $doc2, 'doc2 matches'); # check stdin - lei_ok [qw(q --save - -o), "mboxcl2:mbcl2" ], - undef, { -C => $home, %$lei_opt, 0 => \'d:last.week..'}; + lei_ok [qw(q - -o), "mboxcl2:mbcl2" ], undef, + { -C => $home, %$lei_opt, 0 => \'d:last.week..'}; @s = glob("$home/.local/share/lei/saved-searches/mbcl2-*"); $cfg = PublicInbox::Config->new("$s[0]/lei.saved-search"); is_deeply $cfg->{'lei.q'}, 'd:last.week..', @@ -68,8 +68,12 @@ test_lei(sub { lei_ok([qw(up mbcl2)], undef, { -C => $home, %$lei_opt }); ok(-s "$home/mbcl2" > $size, 'size increased after up'); - ok(!lei(qw(up -q), $home), 'up fails w/o --save'); - like($lei_err, qr/--save was not used/, 'error noted --save'); + ok(!lei(qw(up -q), $home), 'up fails on unknown dir'); + like($lei_err, qr/--no-save was used/, 'error noted --no-save'); + + lei_ok(qw(q --no-save d:last.week.. -q -o), "$home/no-save"); + ok(!lei(qw(up -q), "$home/no-save"), 'up fails on --no-save'); + like($lei_err, qr/--no-save was used/, 'error noted --no-save'); lei_ok qw(ls-search); my @d = split(/\n/, $lei_out); lei_ok qw(ls-search -z); my @z = split(/\0/, $lei_out); @@ -94,7 +98,7 @@ test_lei(sub { open my $mb, '>', "$home/mbrd" or xbail "open $!"; print $mb $pre_existing; close $mb or xbail "close: $!"; - lei_ok(qw(q --save -o mboxrd:mbrd m:qp@example.com -C), $home); + lei_ok(qw(q -o mboxrd:mbrd m:qp@example.com -C), $home); open $mb, '<', "$home/mbrd" or xbail "open $!"; is_deeply([grep(/pre-existing/, <$mb>)], [], 'pre-existing messsage gone w/o augment'); @@ -107,7 +111,7 @@ test_lei(sub { open $mb, '>', "$home/mbrd-aug" or xbail "open $!"; print $mb $pre_existing; close $mb or xbail "close: $!"; - lei_ok(qw(q -a --save -o mboxrd:mbrd-aug m:qp@example.com -C), $home); + lei_ok(qw(q -a -o mboxrd:mbrd-aug m:qp@example.com -C), $home); open $mb, '<', "$home/mbrd-aug" or xbail "open $!"; $mb = do { local $/; <$mb> }; like($mb, qr/pre-existing/, 'pre-existing message preserved w/ -a'); @@ -127,13 +131,13 @@ test_lei(sub { unlike($lei_out, qr/mbrd-aug/, 'forget-search completion cleared after forget'); ok(!lei('up', "$home/mbrd-aug"), 'lei up fails after forget'); - like($lei_err, qr/--save was not used/, 'error noted --save'); + like($lei_err, qr/--no-save was used/, 'error noted --no-save'); # dedupe=mid my $o = "$home/dd-mid"; $in = $doc2->as_string . "\n-------\nappended list sig\n"; lei_ok [qw(import -q -F eml -)], undef, { 0 => \$in, %$lei_opt }; - lei_ok(qw(q --dedupe=mid --save m:testmessage@example.com -o), $o); + lei_ok(qw(q --dedupe=mid m:testmessage@example.com -o), $o); my @m = glob("$o/cur/*"); is(scalar(@m), 1, '--dedupe=mid w/ --save'); $in = $doc2->as_string . "\n-------\nanother list sig\n"; @@ -143,8 +147,7 @@ test_lei(sub { for my $dd (qw(content)) { $o = "$home/dd-$dd"; - lei_ok(qw(q --save m:testmessage@example.com -o), $o, - "--dedupe=$dd"); + lei_ok(qw(q m:testmessage@example.com -o), $o, "--dedupe=$dd"); @m = glob("$o/cur/*"); is(scalar(@m), 3, 'all 3 matches with dedupe='.$dd); } @@ -153,7 +156,7 @@ test_lei(sub { $o = "$home/dd-oid"; my $ibx = create_inbox 'ibx', indexlevel => 'medium', tmpdir => "$home/v1", sub {}; - lei_ok(qw(q --save --dedupe=oid m:qp@example.com -o), $o, + lei_ok(qw(q --dedupe=oid m:qp@example.com -o), $o, '-I', $ibx->{inboxdir}); @m = glob("$o/cur/*"); is(scalar(@m), 1, 'got first result'); @@ -170,12 +173,15 @@ test_lei(sub { symlink($o, "$home/ln -s") or skip "symlinks not supported in $home?: $!", 1; lei_ok('up', "$home/ln -s"); + lei_ok('forget-search', "$home/ln -s"); }; my $v2 = "$home/v2"; # v2: as an output destination my (@before, @after); require PublicInbox::MboxReader; 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'); open my $fh, '<', "$home/before"; PublicInbox::MboxReader->mboxrd($fh, sub { push @before, $_[0] }); @@ -202,5 +208,30 @@ test_lei(sub { lei_ok([qw(edit-search), $v2s], { VISUAL => 'cat', EDITOR => 'cat' }); like($lei_out, qr/^\[lei/sm, 'edit-search can cat'); + + lei_ok('-C', "$home/v2s", qw(q -q -o ../s m:testmessage@example.com)); + lei_ok qw(ls-search); + unlike $lei_out, qr{/\.\./s$}sm, 'relative path not in ls-search'; + like $lei_out, qr{^\Q$home\E/s$}sm, + 'absolute path appears in ls-search'; + lei_ok qw(up ../s -C), "$home/v2s", \'relative lei up'; + lei_ok qw(up), "$home/s", \'absolute lei up'; + + # mess up a config file + 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]: $?"; + 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]: $?"; + lei_ok qw(ls-search); + is($lei_err, '', 'no errors w/ fixed config'); }); done_testing;