X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Flei.t;h=03bbb078ed09e71548b3cbc1372f6c10b6fbca2e;hb=298751baed3ce7ae1549356152784b83220a31f0;hp=2349dca41e3dd304c426110c063b39c38b53d242;hpb=d1b9582872d1824f166a038dcf32b6ae8c6dc735;p=public-inbox.git diff --git a/t/lei.t b/t/lei.t index 2349dca4..03bbb078 100644 --- a/t/lei.t +++ b/t/lei.t @@ -7,11 +7,18 @@ use Test::More; use PublicInbox::TestCommon; use PublicInbox::Config; use File::Path qw(rmtree); +use Fcntl qw(SEEK_SET); +use PublicInbox::Spawn qw(which); require_git 2.6; require_mods(qw(json DBD::SQLite Search::Xapian)); my $opt = { 1 => \(my $out = ''), 2 => \(my $err = '') }; my ($home, $for_destroy) = tmpdir(); my $err_filter; +my $curl = which('curl'); +my @onions = qw(http://hjrcffqmbrq6wope.onion/meta/ + http://czquwvybam4bgbro.onion/meta/ + http://ou63pmih66umazou.onion/meta/); +my $json = ref(PublicInbox::Config->json)->new->utf8->canonical; my $lei = sub { my ($cmd, $env, $xopt) = @_; $out = $err = ''; @@ -33,7 +40,7 @@ local $ENV{XDG_RUNTIME_DIR} = "$home/xdg_run"; local $ENV{HOME} = $home; local $ENV{FOO} = 'BAR'; mkdir "$home/xdg_run", 0700 or BAIL_OUT "mkdir: $!"; -my $home_trash = [ "$home/.local", "$home/.config" ]; +my $home_trash = [ "$home/.local", "$home/.config", "$home/junk" ]; my $cleanup = sub { rmtree([@$home_trash, @_]) }; my $config_file = "$home/.config/lei/config"; my $store_dir = "$home/.local/share/lei"; @@ -137,8 +144,7 @@ my $setup_publicinboxes = sub { my ($ibx) = @_; my $im = PublicInbox::InboxWritable->new($ibx)->importer(0); my $V = $ibx->version; - my @eml = glob('t/*.eml'); - push(@eml, 't/data/0001.patch') if $V == 2; + my @eml = (glob('t/*.eml'), 't/data/0001.patch'); for (@eml) { next if $_ eq 't/psgi_v2-old.eml'; # dup mid $im->add(eml_load($_)) or BAIL_OUT "v$V add $_"; @@ -154,6 +160,25 @@ my $setup_publicinboxes = sub { $seen || BAIL_OUT 'no imports'; }; +my $test_external_remote = sub { + my ($url, $k) = @_; +SKIP: { + my $nr = 5; + skip "$k unset", $nr if !$url; + $curl or skip 'no curl', $nr; + which('torsocks') or skip 'no torsocks', $nr if $url =~ m!\.onion/!; + my $mid = '20140421094015.GA8962@dcvr.yhbt.net'; + my @cmd = ('q', '--only', $url, '-q', "m:$mid"); + ok($lei->(@cmd), "query $url"); + is($err, '', "no errors on $url"); + my $res = $json->decode($out); + is($res->[0]->{'m'}, "<$mid>", "got expected mid from $url"); + ok($lei->(@cmd, 'd:..20101002'), 'no results, no error'); + is($err, '', 'no output on 404, matching local FS behavior'); + is($out, "[null]\n", 'got null results'); +} # /SKIP +}; # /sub + my $test_external = sub { $setup_publicinboxes->(); $cleanup->(); @@ -162,6 +187,10 @@ my $test_external = sub { ok(!-e $config_file && !-e $store_dir, 'nothing created by ls-external'); + ok(!$lei->('add-external', "$home/nonexistent"), + "fails on non-existent dir"); + $lei->('ls-external'); + is($out.$err, '', 'ls-external still has no output'); my $cfg = PublicInbox::Config->new; $cfg->each_inbox(sub { my ($ibx) = @_; @@ -179,6 +208,56 @@ my $test_external = sub { }); $lei->('ls-external'); like($out, qr/boost=0\n/s, 'ls-external has output'); + ok($lei->(qw(add-external -q https://EXAMPLE.com/ibx)), 'add remote'); + is($err, '', 'no warnings after add-external'); + + ok($lei->(qw(_complete lei forget-external)), 'complete for externals'); + my %comp = map { $_ => 1 } split(/\s+/, $out); + ok($comp{'https://example.com/ibx/'}, 'forget external completion'); + $cfg->each_inbox(sub { + my ($ibx) = @_; + ok($comp{$ibx->{inboxdir}}, "local $ibx->{name} completion"); + }); + for my $u (qw(h http https https: https:/ https:// https://e + https://example https://example. https://example.co + https://example.com https://example.com/ + https://example.com/i https://example.com/ibx)) { + ok($lei->(qw(_complete lei forget-external), $u), + "partial completion for URL $u"); + is($out, "https://example.com/ibx/\n", + "completed partial URL $u"); + for my $qo (qw(-I --include --exclude --only)) { + ok($lei->(qw(_complete lei q), $qo, $u), + "partial completion for URL q $qo $u"); + is($out, "https://example.com/ibx/\n", + "completed partial URL $u on q $qo"); + } + } + ok($lei->(qw(_complete lei add-external), 'https://'), + 'add-external hostname completion'); + is($out, "https://example.com/\n", 'completed up to hostname'); + + $lei->('ls-external'); + like($out, qr!https://example\.com/ibx/!s, 'added canonical URL'); + is($err, '', 'no warnings on ls-external'); + ok($lei->(qw(forget-external -q https://EXAMPLE.com/ibx)), + 'forget'); + $lei->('ls-external'); + unlike($out, qr!https://example\.com/ibx/!s, 'removed canonical URL'); + + ok(!$lei->(qw(q s:prefix -o /dev/null -f maildir)), 'bad maildir'); + like($err, qr!/dev/null exists and is not a directory!, + 'error shown'); + is($? >> 8, 1, 'errored out with exit 1'); + + ok(!$lei->(qw(q s:prefix -f mboxcl2 -o), $home), 'bad mbox'); + like($err, qr!\Q$home\E exists and is not a writable file!, + 'error shown'); + is($? >> 8, 1, 'errored out with exit 1'); + + ok(!$lei->(qw(q s:prefix -o /dev/stdout -f Mbox2)), 'bad format'); + like($err, qr/bad mbox --format=mbox2/, 'error shown'); + is($? >> 8, 1, 'errored out with exit 1'); # note, on a Bourne shell users should be able to use either: # s:"use boolean prefix" @@ -188,6 +267,97 @@ my $test_external = sub { # No double-quoting should be imposed on users on the CLI $lei->('q', 's:use boolean prefix'); like($out, qr/search: use boolean prefix/, 'phrase search got result'); + my $res = $json->decode($out); + is(scalar(@$res), 2, 'only 2 element array (1 result)'); + is($res->[1], undef, 'final element is undef'); # XXX should this be? + is(ref($res->[0]), 'HASH', 'first element is hashref'); + $lei->('q', '--pretty', 's:use boolean prefix'); + my $pretty = $json->decode($out); + is_deeply($res, $pretty, '--pretty is identical after decode'); + + for my $fmt (qw(ldjson ndjson jsonl)) { + $lei->('q', '-f', $fmt, 's:use boolean prefix'); + is($out, $json->encode($pretty->[0])."\n", "-f $fmt"); + } + + require IO::Uncompress::Gunzip; + for my $sfx ('', '.gz') { + my $f = "$home/mbox$sfx"; + $lei->('q', '-o', "mboxcl2:$f", 's:use boolean prefix'); + my $cat = $sfx eq '' ? sub { + open my $mb, '<', $f or fail "no mbox: $!"; + <$mb> + } : sub { + my $z = IO::Uncompress::Gunzip->new($f, MultiStream=>1); + <$z>; + }; + my @s = grep(/^Subject:/, $cat->()); + is(scalar(@s), 1, "1 result in mbox$sfx"); + $lei->('q', '-a', '-o', "mboxcl2:$f", 's:see attachment'); + is(grep(!/^#/, $err), 0, 'no errors from augment'); + @s = grep(/^Subject:/, my @wtf = $cat->()); + is(scalar(@s), 2, "2 results in mbox$sfx"); + + $lei->('q', '-a', '-o', "mboxcl2:$f", 's:nonexistent'); + is(grep(!/^#/, $err), 0, "no errors on no results ($sfx)"); + + my @s2 = grep(/^Subject:/, $cat->()); + is_deeply(\@s2, \@s, + "same 2 old results w/ --augment and bad search $sfx"); + + $lei->('q', '-o', "mboxcl2:$f", 's:nonexistent'); + my @res = $cat->(); + is_deeply(\@res, [], "clobber w/o --augment $sfx"); + } + ok(!$lei->('q', '-o', "$home/mbox", 's:nope'), + 'fails if mbox format unspecified'); + ok(!$lei->(qw(q --no-local s:see)), '--no-local'); + is($? >> 8, 1, 'proper exit code'); + like($err, qr/no local or remote.+? to search/, 'no inbox'); + my %e = ( + TEST_LEI_EXTERNAL_HTTPS => 'https://public-inbox.org/meta/', + TEST_LEI_EXTERNAL_ONION => $onions[int(rand(scalar(@onions)))], + ); + for my $k (keys %e) { + my $url = $ENV{$k} // ''; + $url = $e{$k} if $url eq '1'; + $test_external_remote->($url, $k); + } +}; + +my $test_completion = sub { + ok($lei->(qw(_complete lei)), 'no errors on complete'); + my %out = map { $_ => 1 } split(/\s+/s, $out); + ok($out{'q'}, "`lei q' offered as completion"); + ok($out{'add-external'}, "`lei add-external' offered as completion"); + + ok($lei->(qw(_complete lei q)), 'complete q (no args)'); + %out = map { $_ => 1 } split(/\s+/s, $out); + for my $sw (qw(-f --format -o --output --mfolder --augment -a + --mua --mua-cmd --no-local --local --verbose -v + --save-as --no-remote --remote --torsocks + --reverse -r )) { + ok($out{$sw}, "$sw offered as completion"); + } + + ok($lei->(qw(_complete lei q --form)), 'complete q --format'); + is($out, "--format\n", 'complete lei q --format'); + for my $sw (qw(-f --format)) { + ok($lei->(qw(_complete lei q), $sw), "complete q $sw ARG"); + %out = map { $_ => 1 } split(/\s+/s, $out); + for my $f (qw(mboxrd mboxcl2 mboxcl mboxo json jsonl + concatjson maildir)) { + ok($out{$f}, "got $sw $f as output format"); + } + } +}; + +my $test_fail = sub { + $lei->(qw(q --only http://127.0.0.1:99999/bogus/ t:m)); + is($? >> 8, 3, 'got curl exit for bogus URL'); + $lei->(qw(q --only http://127.0.0.1:99999/bogus/ t:m -o), "$home/junk"); + is($? >> 8, 3, 'got curl exit for bogus URL with Maildir'); + is($out, '', 'no output'); }; my $test_lei_common = sub { @@ -195,6 +365,8 @@ my $test_lei_common = sub { $test_config->(); $test_init->(); $test_external->(); + $test_completion->(); + $test_fail->(); }; if ($ENV{TEST_LEI_ONESHOT}) { @@ -204,18 +376,15 @@ if ($ENV{TEST_LEI_ONESHOT}) { local $ENV{XDG_RUNTIME_DIR} = $xrd; $err_filter = qr!\Q$xrd!; $test_lei_common->(); -} - +} else { SKIP: { # real socket - require_mods(qw(Cwd), my $nr = 105); - my $nfd = eval { require Socket::MsgHdr; 5 } // do { + eval { require Socket::MsgHdr; 1 } // do { require PublicInbox::Spawn; - PublicInbox::Spawn->can('send_cmd4') ? 5 : undef; - } // - skip 'Socket::MsgHdr or Inline::C missing or unconfigured', $nr; - + PublicInbox::Spawn->can('send_cmd4'); + } // skip 'Socket::MsgHdr or Inline::C missing or unconfigured', 115; local $ENV{XDG_RUNTIME_DIR} = "$home/xdg_run"; - my $sock = "$ENV{XDG_RUNTIME_DIR}/lei/$nfd.seq.sock"; + my $sock = "$ENV{XDG_RUNTIME_DIR}/lei/5.seq.sock"; + my $err_log = "$ENV{XDG_RUNTIME_DIR}/lei/errors.log"; ok($lei->('daemon-pid'), 'daemon-pid'); is($err, '', 'no error from daemon-pid'); @@ -225,10 +394,15 @@ SKIP: { # real socket ok(-S $sock, 'sock created'); $test_lei_common->(); + is(-s $err_log, 0, 'nothing in errors.log'); + open my $efh, '>>', $err_log or BAIL_OUT $!; + print $efh "phail\n" or BAIL_OUT $!; + close $efh or BAIL_OUT $!; ok($lei->('daemon-pid'), 'daemon-pid'); chomp(my $pid_again = $out); is($pid, $pid_again, 'daemon-pid idempotent'); + like($err, qr/phail/, 'got mock "phail" error previous run'); ok($lei->(qw(daemon-kill)), 'daemon-kill'); is($out, '', 'no output from daemon-kill'); @@ -267,6 +441,7 @@ SKIP: { # real socket } ok(!kill(0, $new_pid), 'daemon exits after unlink'); # success over socket, can't test without -}; +}; # SKIP +} # else done_testing;