treewide: update to v3 Tor onions

[public-inbox.git] / t / lei-externals.t

diff --git a/t/lei-externals.t b/t/lei-externals.t
index 1695ff0be970acb232b7710cef5798ae0faa3372..f148fa3c2b81a1859ac9bba5523f5aa8d24cf0c0 100644 (file)
--- a/t/lei-externals.t
+++ b/t/lei-externals.t
@@ -4,14 +4,14 @@
 use strict; use v5.10.1; use PublicInbox::TestCommon;
 use Fcntl qw(SEEK_SET);
 use PublicInbox::Spawn qw(which);
-use PublicInbox::OnDestroy;
 require_git 2.6;
 require_mods(qw(json DBD::SQLite Search::Xapian));
 use POSIX qw(WTERMSIG WIFSIGNALED SIGPIPE);
 
-my @onions = qw(http://hjrcffqmbrq6wope.onion/meta/
-       http://czquwvybam4bgbro.onion/meta/
-       http://ou63pmih66umazou.onion/meta/);
+my @onions = map { "http://$_.onion/meta/" } qw(
+       4uok3hntl7oi7b4uf4rtfwefqeexfzil2w6kgk2jn5z2f764irre7byd
+       ie5yzdi7fg72h7s4sdcztq5evakq23rdt33mfyfcddc5u3ndnw24ogqd
+       7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd);
 
 my $test_external_remote = sub {
        my ($url, $k) = @_;
@@ -49,7 +49,7 @@ SKIP: {
                ok(WIFSIGNALED($?), "signaled @$out");
                is(WTERMSIG($?), SIGPIPE, "got SIGPIPE @$out");
                seek($err, 0, 0);
-               my @err = grep(!m{mkdir .*sun_path\b}, <$err>);
+               my @err = <$err>;
                is_deeply(\@err, [], "no errors @$out");
        }
        if (-d $ENV{XDG_RUNTIME_DIR} && -w _) {
@@ -57,6 +57,8 @@ SKIP: {
                chomp(my $pid_after = $lei_out);
                is($pid_after, $pid_before, 'pid unchanged') or
                        skip 'daemon died', 1;
+               skip 'not killing persistent lei-daemon', 2 if
+                               $ENV{TEST_LEI_DAEMON_PERSIST_DIR};
                lei_ok 'daemon-kill';
                my $alive = 1;
                for (1..100) {
@@ -93,8 +95,7 @@ test_lei(sub {
                                \'added external');
                is($lei_out.$lei_err, '', 'no output');
        });
-       ok(-s $config_file && -e $store_dir,
-               'add-external created config + store');
+       ok(-s $config_file, 'add-external created config');
        my $lcfg = PublicInbox::Config->new($config_file);
        $cfg->each_inbox(sub {
                my ($ibx) = @_;
@@ -127,8 +128,10 @@ test_lei(sub {
        lei_ok qw(_complete lei forget-external), \'complete for externals';
        my %comp = map { $_ => 1 } split(/\s+/, $lei_out);
        ok($comp{'https://example.com/ibx/'}, 'forget external completion');
+       my @dirs;
        $cfg->each_inbox(sub {
                my ($ibx) = @_;
+               push @dirs, $ibx->{inboxdir};
                ok($comp{$ibx->{inboxdir}}, "local $ibx->{name} completion");
        });
        for my $u (qw(h http https https: https:/ https:// https://e
@@ -157,7 +160,8 @@ test_lei(sub {
        lei_ok('ls-external');
        unlike($lei_out, qr!https://example\.com/ibx/!s,
                'removed canonical URL');
-SKIP: {
+
+       # do some queries
        ok(!lei(qw(q s:prefix -o maildir:/dev/null)), 'bad maildir');
        like($lei_err, qr!/dev/null exists and is not a directory!,
                'error shown');
@@ -233,7 +237,8 @@ SKIP: {
                is(scalar(@s), 2, "2 results in mbox$sfx");
 
                lei_ok('q', '-a', '-o', "mboxcl2:$f", 's:nonexistent');
-               is(grep(!/^#/, $lei_err), 0, "no errors on no results ($sfx)");
+               is(grep(!/^#/, $lei_err), 0, "no errors on no results ($sfx)")
+                       or diag $lei_err;
 
                my @s2 = grep(/^Subject:/, $cat->());
                is_deeply(\@s2, \@s,
@@ -249,11 +254,18 @@ SKIP: {
        is($? >> 8, 1, 'proper exit code');
        like($lei_err, qr/no local or remote.+? to search/, 'no inbox');
 
+       for my $no (['--no-local'], ['--no-external'],
+                       [qw(--no-local --no-external)]) {
+               lei_ok(qw(q mid:testmessage@example.com), @$no,
+                       '-I', $dirs[0], \"-I and @$no combine");
+               $res = json_utf8->decode($lei_out);
+               is($res->[0]->{'m'}, 'testmessage@example.com',
+                       "-I \$DIR got results regardless of @$no");
+       }
+
        {
-               opendir my $dh, '.' or BAIL_OUT "opendir(.) $!";
-               my $od = PublicInbox::OnDestroy->new($$, sub {
-                       chdir $dh or BAIL_OUT "chdir: $!"
-               });
+               skip 'TEST_LEI_DAEMON_PERSIST_DIR in use', 1 if
+                                       $ENV{TEST_LEI_DAEMON_PERSIST_DIR};
                my @q = qw(q -o mboxcl2:rel.mboxcl2 bye);
                lei_ok('-C', $home, @q);
                is(unlink("$home/rel.mboxcl2"), 1, '-C works before q');
@@ -278,6 +290,5 @@ SKIP: {
                $url = $e{$k} if $url eq '1';
                $test_external_remote->($url, $k);
        }
-       }; # /SKIP
 }); # test_lei
 done_testing;